Merge pull request #1512 from skef/bg1504

Copy va_list for second use (and add va_end's to avoid leaking)
adobe-type-tools · Jun 1, 2022 · 8fe509a · 8fe509a
2 parents 1a80bc5 + d8ea8d8
commit 8fe509a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/c/makeotf/lib/hotconv/FeatCtx.cpp b/c/makeotf/lib/hotconv/FeatCtx.cpp
@@ -298,16 +298,19 @@ void FeatCtx::msgPrefix(char **premsg, char **prefix) {
 }
 
 void FeatCtx::featMsg(int msgType, const char *fmt, ...) {
-    va_list ap;
+    va_list ap, cap;
     std::vector<char> buf;
     buf.resize(128);
 
     va_start(ap, fmt);
+    va_copy(cap, ap);
     int l = vsnprintf(buf.data(), 128, fmt, ap) + 1;
+    va_end(ap);
     if ( l > 128 ) {
         buf.resize(l);
-        vsnprintf(buf.data(), l, fmt, ap);
+        vsnprintf(buf.data(), l, fmt, cap);
     }
+    va_end(cap);
     hotMsg(g, msgType, buf.data());
 }