diff options
| author | Christian Heimes <christian@cheimes.de> | 2013-07-01 13:17:45 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2013-07-01 13:17:45 (GMT) |
| commit | a24b4d260beafb5b45450ff46d7740bea8eaa4a9 (patch) | |
| tree | 377a84158bbfeeb2b38e6714b40fb460a56f8310 /Modules/_pickle.c | |
| parent | 8a0b7756e28f9374a8a316ca9a81613cc6b6e022 (diff) | |
| download | cpython-a24b4d260beafb5b45450ff46d7740bea8eaa4a9.zip cpython-a24b4d260beafb5b45450ff46d7740bea8eaa4a9.tar.gz cpython-a24b4d260beafb5b45450ff46d7740bea8eaa4a9.tar.bz2 | |
Issue #18339: Negative ints keys in unpickler.memo dict no longer cause a
segfault inside the _pickle C extension.
Diffstat (limited to 'Modules/_pickle.c')
| -rw-r--r-- | Modules/_pickle.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/_pickle.c b/Modules/_pickle.c index a8d6684..195ee5d 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -5931,6 +5931,11 @@ Unpickler_set_memo(UnpicklerObject *self, PyObject *obj) idx = PyLong_AsSsize_t(key); if (idx == -1 && PyErr_Occurred()) goto error; + if (idx < 0) { + PyErr_SetString(PyExc_ValueError, + "memos key must be positive integers."); + goto error; + } if (_Unpickler_MemoPut(self, idx, value) < 0) goto error; } |