Do not leak RedirectStateData on snprintf error/truncation (#2205)

diff --git a/src/redirect.cc b/src/redirect.cc
index 3ed07c1a75cc976e0183bc0c8e33ed94c9d3af7f..c24877f26788f2a2260df783a2cfcf64a7096b59 100644 (file)
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -230,20 +230,13 @@ constructHelperQuery(const char * const name, const Helper::Client::Pointer &hlp
     int sz;
     Http::StatusCode status;
 
-    /** TODO: create a standalone method to initialize
-     * the RedirectStateData for all the helpers.
-     */
-    RedirectStateData *r = new RedirectStateData(http->uri);
-    r->handler = handler;
-    r->data = cbdataReference(data);
-
     static MemBuf requestExtras;
     requestExtras.reset();
     if (requestExtrasFmt)
         requestExtrasFmt->assemble(requestExtras, http->al, 0);
 
     sz = snprintf(buf, MAX_REDIRECTOR_REQUEST_STRLEN, "%s%s%s\n",
-                  r->orig_url.c_str(),
+                  http->uri,
                   requestExtras.hasContent() ? " " : "",
                   requestExtras.hasContent() ? requestExtras.content() : "");
 
@@ -276,6 +269,13 @@ constructHelperQuery(const char * const name, const Helper::Client::Pointer &hlp
         return;
     }
 
+    /** TODO: create a standalone method to initialize
+     * the RedirectStateData for all the helpers.
+     */
+    const auto r = new RedirectStateData(http->uri);
+    r->handler = handler;
+    r->data = cbdataReference(data);
+
     debugs(61,6, "sending '" << buf << "' to the " << name << " helper");
     helperSubmit(hlp, buf, replyHandler, r);
 }