mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Catch a few extra error cases in marshal.c

Browse source
This commit is contained in:
Kristján Valur Jónsson 2013-10-13 15:19:56 +00:00
parent 26e066d34c
commit 0a7697b718
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Python/marshal.c
View file

@ -1297,6 +1297,8 @@ r_object(RFILE *p)
if (name == NULL) if (name == NULL)
goto code_error; goto code_error;
firstlineno = (int)r_long(p); firstlineno = (int)r_long(p);
if (firstlineno == -1 && PyErr_Occurred())
break;
lnotab = r_object(p); lnotab = r_object(p);
if (lnotab == NULL) if (lnotab == NULL)
goto code_error; goto code_error;
@ -1326,6 +1328,8 @@ r_object(RFILE *p)
case TYPE_REF: case TYPE_REF:
n = r_long(p); n = r_long(p);
if (n < 0 || n >= PyList_GET_SIZE(p->refs)) { if (n < 0 || n >= PyList_GET_SIZE(p->refs)) {
if (n == -1 && PyErr_Occurred())
break;
PyErr_SetString(PyExc_ValueError, "bad marshal data (invalid reference)"); PyErr_SetString(PyExc_ValueError, "bad marshal data (invalid reference)");
break; break;
} }