va_end() all va_copy()ed va_lists.

tiran · tiran · commit 2f2fee19ec63 · 2016-09-21T11:37:27.000+02:00
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -2702,6 +2702,7 @@ objargs_mkstack(PyObject **small_stack, Py_ssize_t small_stack_size,
     else {
         stack = PyMem_Malloc(n * sizeof(stack[0]));
         if (stack == NULL) {
+            va_end(countva);
             PyErr_NoMemory();
             return NULL;
         }
@@ -2710,6 +2711,7 @@ objargs_mkstack(PyObject **small_stack, Py_ssize_t small_stack_size,
     for (i = 0; i < n; ++i) {
         stack[i] = va_arg(va, PyObject *);
     }
+    va_end(countva);
     return stack;
 }
 
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -2891,6 +2891,7 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
             do
             {
                 if ((unsigned char)*p > 127) {
+                    va_end(vargs2);
                     PyErr_Format(PyExc_ValueError,
                         "PyUnicode_FromFormatV() expects an ASCII-encoded format "
                         "string, got a non-ASCII byte: 0x%02x",
@@ -2911,9 +2912,11 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
             f = p;
         }
     }
+    va_end(vargs2);
     return _PyUnicodeWriter_Finish(&writer);
 
   fail:
+    va_end(vargs2);
     _PyUnicodeWriter_Dealloc(&writer);
     return NULL;
 }
diff --git a/Python/getargs.c b/Python/getargs.c
@@ -141,20 +141,26 @@ int
 PyArg_VaParse(PyObject *args, const char *format, va_list va)
 {
     va_list lva;
+    int retval;
 
     va_copy(lva, va);
 
-    return vgetargs1(args, format, &lva, 0);
+    retval = vgetargs1(args, format, &lva, 0);
+    va_end(lva);
+    return retval;
 }
 
 int
 _PyArg_VaParse_SizeT(PyObject *args, const char *format, va_list va)
 {
     va_list lva;
+    int retval;
 
     va_copy(lva, va);
 
-    return vgetargs1(args, format, &lva, FLAG_SIZE_T);
+    retval = vgetargs1(args, format, &lva, FLAG_SIZE_T);
+    va_end(lva);
+    return retval;
 }
 
 
@@ -1405,6 +1411,7 @@ PyArg_VaParseTupleAndKeywords(PyObject *args,
     va_copy(lva, va);
 
     retval = vgetargskeywords(args, keywords, format, kwlist, &lva, 0);
+    va_end(lva);
     return retval;
 }
 
@@ -1430,6 +1437,7 @@ _PyArg_VaParseTupleAndKeywords_SizeT(PyObject *args,
 
     retval = vgetargskeywords(args, keywords, format,
                               kwlist, &lva, FLAG_SIZE_T);
+    va_end(lva);
     return retval;
 }
 
@@ -1534,6 +1542,7 @@ _PyArg_VaParseTupleAndKeywordsFast(PyObject *args, PyObject *keywords,
     va_copy(lva, va);
 
     retval = vgetargskeywordsfast(args, keywords, parser, &lva, 0);
+    va_end(lva);
     return retval;
 }
 
@@ -1555,6 +1564,7 @@ _PyArg_VaParseTupleAndKeywordsFast_SizeT(PyObject *args, PyObject *keywords,
     va_copy(lva, va);
 
     retval = vgetargskeywordsfast(args, keywords, parser, &lva, FLAG_SIZE_T);
+    va_end(lva);
     return retval;
 }
 
diff --git a/Python/modsupport.c b/Python/modsupport.c
@@ -467,18 +467,22 @@ va_build_value(const char *format, va_list va, int flags)
     const char *f = format;
     int n = countformat(f, '\0');
     va_list lva;
-
-    va_copy(lva, va);
+    PyObject *retval;
 
     if (n < 0)
         return NULL;
     if (n == 0) {
         Py_INCREF(Py_None);
         return Py_None;
     }
-    if (n == 1)
-        return do_mkvalue(&f, &lva, flags);
-    return do_mktuple(&f, &lva, '\0', n, flags);
+    va_copy(lva, va);
+    if (n == 1) {
+        retval = do_mkvalue(&f, &lva, flags);
+    } else {
+        retval = do_mktuple(&f, &lva, '\0', n, flags);
+    }
+    va_end(lva);
+    return retval;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -2702,6 +2702,7 @@ objargs_mkstack(PyObject **small_stack, Py_ssize_t small_stack_size,`
`2702`	`2702`	`else {`
`2703`	`2703`	`stack = PyMem_Malloc(n * sizeof(stack[0]));`
`2704`	`2704`	`if (stack == NULL) {`
	`2705`	`+ va_end(countva);`
`2705`	`2706`	`PyErr_NoMemory();`
`2706`	`2707`	`return NULL;`
`2707`	`2708`	`}`
`@@ -2710,6 +2711,7 @@ objargs_mkstack(PyObject **small_stack, Py_ssize_t small_stack_size,`
`2710`	`2711`	`for (i = 0; i < n; ++i) {`
`2711`	`2712`	`stack[i] = va_arg(va, PyObject *);`
`2712`	`2713`	`}`
	`2714`	`+ va_end(countva);`
`2713`	`2715`	`return stack;`
`2714`	`2716`	`}`
`2715`	`2717`
Original file line number	Diff line number	Diff line change
`@@ -2891,6 +2891,7 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)`
`2891`	`2891`	`do`
`2892`	`2892`	`{`
`2893`	`2893`	`if ((unsigned char)*p > 127) {`
	`2894`	`+ va_end(vargs2);`
`2894`	`2895`	`PyErr_Format(PyExc_ValueError,`
`2895`	`2896`	`"PyUnicode_FromFormatV() expects an ASCII-encoded format "`
`2896`	`2897`	`"string, got a non-ASCII byte: 0x%02x",`
`@@ -2911,9 +2912,11 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)`
`2911`	`2912`	`f = p;`
`2912`	`2913`	`}`
`2913`	`2914`	`}`
	`2915`	`+ va_end(vargs2);`
`2914`	`2916`	`return _PyUnicodeWriter_Finish(&writer);`
`2915`	`2917`
`2916`	`2918`	`fail:`
	`2919`	`+ va_end(vargs2);`
`2917`	`2920`	`_PyUnicodeWriter_Dealloc(&writer);`
`2918`	`2921`	`return NULL;`
`2919`	`2922`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,20 +141,26 @@ int`
`141`	`141`	`PyArg_VaParse(PyObject args, const char format, va_list va)`
`142`	`142`	`{`
`143`	`143`	`va_list lva;`
	`144`	`+ int retval;`
`144`	`145`
`145`	`146`	`va_copy(lva, va);`
`146`	`147`
`147`		`- return vgetargs1(args, format, &lva, 0);`
	`148`	`+ retval = vgetargs1(args, format, &lva, 0);`
	`149`	`+ va_end(lva);`
	`150`	`+ return retval;`
`148`	`151`	`}`
`149`	`152`
`150`	`153`	`int`
`151`	`154`	`_PyArg_VaParse_SizeT(PyObject args, const char format, va_list va)`
`152`	`155`	`{`
`153`	`156`	`va_list lva;`
	`157`	`+ int retval;`
`154`	`158`
`155`	`159`	`va_copy(lva, va);`
`156`	`160`
`157`		`- return vgetargs1(args, format, &lva, FLAG_SIZE_T);`
	`161`	`+ retval = vgetargs1(args, format, &lva, FLAG_SIZE_T);`
	`162`	`+ va_end(lva);`
	`163`	`+ return retval;`
`158`	`164`	`}`
`159`	`165`
`160`	`166`
`@@ -1405,6 +1411,7 @@ PyArg_VaParseTupleAndKeywords(PyObject *args,`
`1405`	`1411`	`va_copy(lva, va);`
`1406`	`1412`
`1407`	`1413`	`retval = vgetargskeywords(args, keywords, format, kwlist, &lva, 0);`
	`1414`	`+ va_end(lva);`
`1408`	`1415`	`return retval;`
`1409`	`1416`	`}`
`1410`	`1417`
`@@ -1430,6 +1437,7 @@ _PyArg_VaParseTupleAndKeywords_SizeT(PyObject *args,`
`1430`	`1437`
`1431`	`1438`	`retval = vgetargskeywords(args, keywords, format,`
`1432`	`1439`	`kwlist, &lva, FLAG_SIZE_T);`
	`1440`	`+ va_end(lva);`
`1433`	`1441`	`return retval;`
`1434`	`1442`	`}`
`1435`	`1443`
`@@ -1534,6 +1542,7 @@ _PyArg_VaParseTupleAndKeywordsFast(PyObject args, PyObject keywords,`
`1534`	`1542`	`va_copy(lva, va);`
`1535`	`1543`
`1536`	`1544`	`retval = vgetargskeywordsfast(args, keywords, parser, &lva, 0);`
	`1545`	`+ va_end(lva);`
`1537`	`1546`	`return retval;`
`1538`	`1547`	`}`
`1539`	`1548`
`@@ -1555,6 +1564,7 @@ _PyArg_VaParseTupleAndKeywordsFast_SizeT(PyObject args, PyObject keywords,`
`1555`	`1564`	`va_copy(lva, va);`
`1556`	`1565`
`1557`	`1566`	`retval = vgetargskeywordsfast(args, keywords, parser, &lva, FLAG_SIZE_T);`
	`1567`	`+ va_end(lva);`
`1558`	`1568`	`return retval;`
`1559`	`1569`	`}`
`1560`	`1570`