diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-10-03 08:15:49 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-10-03 08:15:49 (GMT) |
| commit | c3a12775e26f8c8f4148cb247dc88bc38f05dc58 (patch) | |
| tree | 09ad84efb85f3136839cbeb285f05a9f7916fb6e | |
| parent | 7664bfe4e2540f07651372075d3179ab2f93988b (diff) | |
| download | cpython-c3a12775e26f8c8f4148cb247dc88bc38f05dc58.zip cpython-c3a12775e26f8c8f4148cb247dc88bc38f05dc58.tar.gz cpython-c3a12775e26f8c8f4148cb247dc88bc38f05dc58.tar.bz2 | |
Issue #7019: An attempt to unmarshal bad long data could produce
unnormalized PyLong objects; make it raise ValueError instead.
| -rw-r--r-- | Lib/test/test_marshal.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/marshal.c | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py index 943aa55..0dd59d1 100644 --- a/Lib/test/test_marshal.py +++ b/Lib/test/test_marshal.py @@ -262,6 +262,11 @@ class BugsTestCase(unittest.TestCase): testString = 'abc' * size marshal.dumps(testString) + def test_invalid_longs(self): + # Issue #7019: marshal.loads shouldn't produce unnormalized PyLongs + invalid_string = 'l\x02\x00\x00\x00\x00\x00\x00\x00' + self.assertRaises(ValueError, marshal.loads, invalid_string) + def test_main(): test_support.run_unittest(IntTestCase, @@ -12,6 +12,9 @@ What's New in Python 2.6.4a1? Core and Builtins ----------------- +- Issue #7019: Raise ValueError when unmarshalling bad long data, instead + of producing internally inconsistent Python longs. + Library ------- diff --git a/Python/marshal.c b/Python/marshal.c index 52d2257..a4c831f 100644 --- a/Python/marshal.c +++ b/Python/marshal.c @@ -589,7 +589,8 @@ r_object(RFILE *p) ob->ob_size = n; for (i = 0; i < size; i++) { int digit = r_short(p); - if (digit < 0) { + if (digit < 0 || + (digit == 0 && i == size-1)) { Py_DECREF(ob); PyErr_SetString(PyExc_ValueError, "bad marshal data"); |