ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

va_end() all va_copy()ed va_lists.

Browse source
This commit is contained in:
Christian Heimes 2016-09-21 11:37:27 +02:00
parent 1c56bf0bad
commit 2f2fee19ec
4 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Objects/abstract.c
View file

@ -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;
}

3
Objects/unicodeobject.c
View file

@ -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;
}