diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-08-16 05:03:44 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-08-16 05:03:44 (GMT) |
| commit | 10bc0f6edf4c24bffe13a0f7aae060ea477aad1e (patch) | |
| tree | b7f2ec825359c46103224f56f1a213948cb0e580 | |
| parent | 432ea4ff375f920fa4a469d34e5dad56fb33f915 (diff) | |
| parent | 3a27b0857ef6d35911509eef88e567663bb0a0b6 (diff) | |
| download | cpython-10bc0f6edf4c24bffe13a0f7aae060ea477aad1e.zip cpython-10bc0f6edf4c24bffe13a0f7aae060ea477aad1e.tar.gz cpython-10bc0f6edf4c24bffe13a0f7aae060ea477aad1e.tar.bz2 | |
merge 3.3 (#27774)
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/_sre.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -16,6 +16,8 @@ Library - In the curses module, raise an error if window.getstr() or window.instr() is passed a negative value. +- Issue #27774: Fix possible Py_DECREF on unowned object in _sre. + - Issue #27760: Fix possible integer overflow in binascii.b2a_qp. - Issue #27758: Fix possible integer overflow in the _csv module for large record diff --git a/Modules/_sre.c b/Modules/_sre.c index d6fcda1..8d111e3 100644 --- a/Modules/_sre.c +++ b/Modules/_sre.c @@ -2137,10 +2137,8 @@ match_groupdict(MatchObject* self, PyObject* args, PyObject* kw) if (!key) goto failed; value = match_getslice(self, key, def); - if (!value) { - Py_DECREF(key); + if (!value) goto failed; - } status = PyDict_SetItem(result, key, value); Py_DECREF(value); if (status < 0) |