Commit 0803e968 authored by Benjamin Peterson's avatar Benjamin Peterson

merge 3.4 (#27774)

parents cc4e0900 f0759f38
...@@ -42,6 +42,8 @@ Library ...@@ -42,6 +42,8 @@ Library
- In the curses module, raise an error if window.getstr() or window.instr() is - In the curses module, raise an error if window.getstr() or window.instr() is
passed a negative value. 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 #27760: Fix possible integer overflow in binascii.b2a_qp.
- Issue #27758: Fix possible integer overflow in the _csv module for large record - Issue #27758: Fix possible integer overflow in the _csv module for large record
......
...@@ -2196,10 +2196,8 @@ _sre_SRE_Match_groupdict_impl(MatchObject *self, PyObject *default_value) ...@@ -2196,10 +2196,8 @@ _sre_SRE_Match_groupdict_impl(MatchObject *self, PyObject *default_value)
if (!key) if (!key)
goto failed; goto failed;
value = match_getslice(self, key, default_value); value = match_getslice(self, key, default_value);
if (!value) { if (!value)
Py_DECREF(key);
goto failed; goto failed;
}
status = PyDict_SetItem(result, key, value); status = PyDict_SetItem(result, key, value);
Py_DECREF(value); Py_DECREF(value);
if (status < 0) if (status < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment