std.ip() emits an error to the log and returns the fallback when

there is insufficient workspace

std.ip() emits an error to the log and returns the fallback when
there is insufficient workspace
54061934 · Geoff Simmons · e05ac94a · 54061934
Commit 54061934 authored May 24, 2015 by Geoff Simmons
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

vmod_std_conversions.c lib/libvmod_std/vmod_std_conversions.c +5 -1

No files found.
--- a/lib/libvmod_std/vmod_std_conversions.c
+++ b/lib/libvmod_std/vmod_std_conversions.c
@@ -140,7 +140,11 @@ vmod_ip(VRT_CTX, VCL_STRING s, VCL_IP d)
 	assert(VSA_Sane(d));

 	p = WS_Alloc(ctx->ws, vsa_suckaddr_len);
-	AN(p);
+	if (p == NULL) {
+		VSLb(ctx->vsl, SLT_VCL_Error,
+		     "vmod std.ip(): insufficient workspace");
+		return d;
+	}
 	r = NULL;

 	if (s != NULL) {