Mercurial > cpython-lru_cache-weakref
diff Python/marshal.c @ 8465:0e6fbbe3b63c legacy-trunk
When unmarshalling, add test for negative lengths on strings, tuples
and lists; if the size is negative, raise an exception. Also raise an
exception when an undefined type is found -- all this to increase the
chance that garbage input causes an exception instead of a core dump.
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Mon, 08 Jun 1998 20:27:29 +0000 |
| parents | cd828462acbb |
| children | 0a67db47e1d0 |
line wrap: on
line diff
--- a/Python/marshal.c Fri May 29 21:37:21 1998 +0000 +++ b/Python/marshal.c Mon Jun 08 20:27:29 1998 +0000 @@ -463,6 +463,10 @@ case TYPE_STRING: n = r_long(p); + if (n < 0) { + PyErr_SetString(PyExc_ValueError, "bad marshal data"); + return NULL; + } v = PyString_FromStringAndSize((char *)NULL, n); if (v != NULL) { if (r_string(PyString_AsString(v), (int)n, p) != n) { @@ -476,6 +480,10 @@ case TYPE_TUPLE: n = r_long(p); + if (n < 0) { + PyErr_SetString(PyExc_ValueError, "bad marshal data"); + return NULL; + } v = PyTuple_New((int)n); if (v == NULL) return v; @@ -492,6 +500,10 @@ case TYPE_LIST: n = r_long(p); + if (n < 0) { + PyErr_SetString(PyExc_ValueError, "bad marshal data"); + return NULL; + } v = PyList_New((int)n); if (v == NULL) return v; @@ -571,8 +583,8 @@ default: /* Bogus data got written, which isn't ideal. This will let you keep working and recover. */ - Py_INCREF(Py_None); - return Py_None; + PyErr_SetString(PyExc_ValueError, "bad marshal data"); + return NULL; } }