Fix error handling.

src/vmod_re2.c

@@ -96,17 +96,19 @@ errmsg(VRT_CTX, const char *fmt, ...)
         va_list args;
 
         va_start(args, fmt);
+        if (ctx->vsl)
+                VSLbv(ctx->vsl, SLT_VCL_Error, fmt, args);
+        else
+                VSLv(SLT_VCL_Error, 0, fmt, args);
+        va_end(args);
+
         if (ctx->method == VCL_MET_INIT) {
                 AN(ctx->msg);
+		va_start(args, fmt);
                 VSB_vprintf(ctx->msg, fmt, args);
+		va_end(args);
                 VRT_handling(ctx, VCL_RET_FAIL);
         }
-        else if (ctx->vsl)
-                VSLbv(ctx->vsl, SLT_VCL_Error, fmt, args);
-        else
-                /* Should this ever happen in vcl_fini() ... */
-                VSL(SLT_VCL_Error, 0, fmt, args);
-        va_end(args);
 }
 
 static void