mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try to cleanup the error handling a bit so there aren't false positives 

from static analysis.  v was already checked for NULL above, so we don't
need a second check.
This commit is contained in:
Neal Norwitz 2006-03-06 23:07:34 +00:00
parent 4dc4a8401a
commit 3e90fa5940
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Python/modsupport.c
View File

@ -206,7 +206,8 @@ do_mklist(const char **p_format, va_list *p_va, int endchar, int n)
int itemfailed = 0; int itemfailed = 0;
if (n < 0) if (n < 0)
return NULL; return NULL;
if ((v = PyList_New(n)) == NULL) v = PyList_New(n);
if (v == NULL)
return NULL; return NULL;
/* Note that we can't bail immediately on error as this will leak /* Note that we can't bail immediately on error as this will leak
refcounts on any 'N' arguments. */ refcounts on any 'N' arguments. */
@ -219,18 +220,21 @@ do_mklist(const char **p_format, va_list *p_va, int endchar, int n)
} }
PyList_SetItem(v, i, w); PyList_SetItem(v, i, w);
} }
if (v != NULL && **p_format != endchar) {
if (itemfailed) {
/* do_mkvalue() should have already set an error */
Py_DECREF(v);
return NULL;
}
if (**p_format != endchar) {
Py_DECREF(v); Py_DECREF(v);
v = NULL;
PyErr_SetString(PyExc_SystemError, PyErr_SetString(PyExc_SystemError,
"Unmatched paren in format"); "Unmatched paren in format");
return NULL;
} }
else if (endchar)
if (endchar)
++*p_format; ++*p_format;
if (itemfailed) {
Py_DECREF(v);
v = NULL;
}
return v; return v;
} }