TS-2888: remove varargs from fabricate

Author: persiaAziz-zz

proxy/http/HttpBodyFactory.cc

@@ -63,7 +63,7 @@ char *
 HttpBodyFactory::fabricate_with_old_api(const char *type, HttpTransact::State *context, int64_t max_buffer_length,
                                         int64_t *resulting_buffer_length, char *content_language_out_buf,
                                         size_t content_language_buf_size, char *content_type_out_buf, size_t content_type_buf_size,
-                                        const char *format, va_list ap)
+                                        int format_size, const char *format, va_list ap)
 {
   char *buffer            = nullptr;
   const char *lang_ptr    = nullptr;
@@ -124,16 +124,8 @@ HttpBodyFactory::fabricate_with_old_api(const char *type, HttpTransact::State *c
   ///////////////////////////////////////////
   // check if we don't need to format body //
   ///////////////////////////////////////////
-  if (format) {
-    // The length from ink_bvsprintf includes the trailing NUL, so adjust the final
-    // length accordingly.
-    int l = ink_bvsprintf(nullptr, format, ap);
-    if (l <= max_buffer_length) {
-      buffer                   = (char *)ats_malloc(l);
-      *resulting_buffer_length = ink_bvsprintf(buffer, format, ap) - 1;
-      plain_flag               = true;
-    }
-  }
+
+  buffer = (format == nullptr) ? nullptr : ats_strndup(format, format_size);
   /////////////////////////////////////////////////////////
   // try to fabricate the desired type of error response //
   /////////////////////////////////////////////////////////

proxy/http/HttpBodyFactory.h

@@ -64,6 +64,7 @@
 #include "HttpTransact.h"
 #include "Main.h"
 #include "ts/RawHashTable.h"
+#include "ts/ink_sprintf.h"
 
 #define HTTP_BODY_TEMPLATE_MAGIC 0xB0DFAC00
 #define HTTP_BODY_SET_MAGIC 0xB0DFAC55
@@ -156,7 +157,8 @@ class HttpBodyFactory
   ///////////////////////
   char *fabricate_with_old_api(const char *type, HttpTransact::State *context, int64_t max_buffer_length,
                                int64_t *resulting_buffer_length, char *content_language_out_buf, size_t content_language_buf_size,
-                               char *content_type_out_buf, size_t content_type_buf_size, const char *format, va_list ap);
+                               char *content_type_out_buf, size_t content_type_buf_size, int format_size, const char *format,
+                               va_list ap);
 
   char *
   fabricate_with_old_api_build_va(const char *type, HttpTransact::State *context, int64_t max_buffer_length,
@@ -166,12 +168,20 @@ class HttpBodyFactory
   {
     char *msg;
     va_list ap;
-
-    va_start(ap, format);
-    msg = fabricate_with_old_api(type, context, max_buffer_length, resulting_buffer_length, content_language_out_buf,
-                                 content_language_buf_size, content_type_out_buf, content_type_buf_size, format, ap);
-    va_end(ap);
-    return msg;
+    if (format) {
+      // The length from ink_bvsprintf includes the trailing NUL, so adjust the final
+      // length accordingly.
+      int l = ink_bvsprintf(nullptr, format, ap);
+      if (l <= max_buffer_length) {
+        msg                      = (char *)ats_malloc(l);
+        *resulting_buffer_length = ink_bvsprintf(msg, format, ap) - 1;
+      }
+    }
+    char *buf = fabricate_with_old_api(type, context, max_buffer_length, resulting_buffer_length, content_language_out_buf,
+                                       content_language_buf_size, content_type_out_buf, content_type_buf_size,
+                                       *resulting_buffer_length, msg, ap);
+    ats_free(msg);
+    return buf;
   }
 
   void dump_template_tables(FILE *fp = stderr);

proxy/http/HttpTransact.cc

@@ -8199,8 +8199,8 @@ HttpTransact::build_error_response(State *s, HTTPStatus status_code, const char
   char *new_msg;
 
   new_msg = body_factory->fabricate_with_old_api(error_body_type, s, 8192, &len, body_language, sizeof(body_language), body_type,
-                                                 sizeof(body_type), s->internal_msg_buffer_size ? s->internal_msg_buffer : nullptr,
-                                                 nullptr);
+                                                 sizeof(body_type), s->internal_msg_buffer_size,
+                                                 s->internal_msg_buffer_size ? s->internal_msg_buffer : nullptr, nullptr);
 
   // After the body factory is called, a new "body" is allocated, and we must replace it. It is
   // unfortunate that there's no way to avoid this fabrication even when there is no substitutions...