From: hno <>
Date: Sun, 6 Jun 2004 21:09:55 +0000 (+0000)
Subject: Bug #753: va_copy required
X-Git-Tag: SQUID_3_0_PRE4~1087
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af32d1ae1fb37c043bc1b240406e97e3c67d4601;p=thirdparty%2Fsquid.git

Bug #753: va_copy required
Bug #995: segfault on long URLs (bug in previous patch to Bug #753)
---

diff --git a/src/MemBuf.cc b/src/MemBuf.cc
index ba07b4b413..72065ffdba 100644
--- a/src/MemBuf.cc
+++ b/src/MemBuf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: MemBuf.cc,v 1.35 2004/06/02 19:19:21 hno Exp $
+ * $Id: MemBuf.cc,v 1.36 2004/06/06 15:09:55 hno Exp $
  *
  * DEBUG: section 59    auto-growing Memory Buffer with printf
  * AUTHOR: Alex Rousskov
@@ -268,6 +268,7 @@ memBufVPrintf(MemBuf * mb, const char *fmt, va_list vargs) {
          */
         VA_COPY(ap,vargs);
         sz = vsnprintf(mb->buf + mb->size, free_space, fmt, ap);
+        va_end(ap);
 #else /* VA_COPY */
 
         sz = vsnprintf(mb->buf + mb->size, free_space, fmt, vargs);
@@ -282,7 +283,6 @@ memBufVPrintf(MemBuf * mb, const char *fmt, va_list vargs) {
             break;
     }
 
-    va_end(ap);
     mb->size += sz;
     /* on Linux and FreeBSD, '\0' is not counted in return value */
     /* on XXX it might be counted */