changeset:   102692:64b0e0a29874
parent:      102687:a8cd67e80ed3
parent:      102691:424cb9482974
user:        Benjamin Peterson <benjamin@python.org>
date:        Mon Aug 15 22:05:16 2016 -0700
files:       Misc/NEWS Modules/_sre.c Modules/clinic/_sre.c.h Modules/sre_lib.h
description:
merge 3.5 (#27774)


diff -r a8cd67e80ed3 -r 64b0e0a29874 Misc/NEWS
--- a/Misc/NEWS	Mon Aug 15 21:56:11 2016 -0700
+++ b/Misc/NEWS	Mon Aug 15 22:05:16 2016 -0700
@@ -107,6 +107,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 a8cd67e80ed3 -r 64b0e0a29874 Modules/_sre.c
--- a/Modules/_sre.c	Mon Aug 15 21:56:11 2016 -0700
+++ b/Modules/_sre.c	Mon Aug 15 22:05:16 2016 -0700
@@ -2194,10 +2194,8 @@
         if (!key)
             goto failed;
         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)