Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #17828: va_start() must be accompanied by va_end() 

CID 1128793: Missing varargs init or cleanup (VARARGS)
This commit is contained in:
Christian Heimes 2013-11-14 01:39:35 +01:00
parent 2bcae708d8
commit 507eabdf11
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Objects/exceptions.c
View File

@ -2632,12 +2632,6 @@ _PyErr_TrySetFromCause(const char *format, ...)
PyObject *new_exc, *new_val, *new_tb;
va_list vargs;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
PyErr_Fetch(&exc, &val, &tb);
caught_type = (PyTypeObject *) exc;
/* Ensure type info indicates no extra state is stored at the C level */
@ -2690,7 +2684,14 @@ _PyErr_TrySetFromCause(const char *format, ...)
* types as well, but that's quite a bit trickier due to the extra
* state potentially stored on OSError instances.
*/
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
msg_prefix = PyUnicode_FromFormatV(format, vargs);
va_end(vargs);
if (msg_prefix == NULL)
return NULL;