changeset:   102690:2e404ac88e0e
branch:      3.4
parent:      102682:1de897915974
parent:      102689:cbf2a05648b3
user:        Benjamin Peterson <benjamin@python.org>
date:        Mon Aug 15 22:03:44 2016 -0700
files:       Misc/NEWS Modules/_sre.c Modules/sre_lib.h
description:
merge 3.3 (#27774)


diff -r 1de897915974 -r 2e404ac88e0e Misc/NEWS
--- a/Misc/NEWS	Mon Aug 15 21:40:14 2016 -0700
+++ b/Misc/NEWS	Mon Aug 15 22:03:44 2016 -0700
@@ -16,6 +16,8 @@
 - 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 -r 1de897915974 -r 2e404ac88e0e Modules/_sre.c
--- a/Modules/_sre.c	Mon Aug 15 21:40:14 2016 -0700
+++ b/Modules/_sre.c	Mon Aug 15 22:03:44 2016 -0700
@@ -2137,10 +2137,8 @@
         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)