From: Benjamin Peterson Date: Tue, 16 Aug 2016 05:05:06 +0000 (-0700) Subject: merge 3.4 (#27774) X-Git-Tag: v3.6.0b1~711^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76aa1fb3b1b96120ca8fdfd48c53dc7d2a320049;p=thirdparty%2FPython%2Fcpython.git merge 3.4 (#27774) --- 76aa1fb3b1b96120ca8fdfd48c53dc7d2a320049 diff --cc Modules/_sre.c index 84c876945583,8d111e382ab0..09b58352de4f --- a/Modules/_sre.c +++ b/Modules/_sre.c @@@ -2195,11 -2136,9 +2195,9 @@@ _sre_SRE_Match_groupdict_impl(MatchObje key = PyList_GET_ITEM(keys, index); if (!key) goto failed; - value = match_getslice(self, key, def); + value = match_getslice(self, key, default_value); - if (!value) { - Py_DECREF(key); + if (!value) goto failed; - } status = PyDict_SetItem(result, key, value); Py_DECREF(value); if (status < 0)