From: Berker Peksag <berker.peksag@gmail.com>
Date: Mon, 27 Feb 2017 17:41:21 +0000 (+0300)
Subject: bpo-29655: Fixed possible reference leaks in `import *`. (#301) (#348)
X-Git-Tag: v3.6.1rc1~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7accf2033d03025cc5324f8b9d22582bca3623e9;p=thirdparty%2FPython%2Fcpython.git

bpo-29655: Fixed possible reference leaks in `import *`. (#301) (#348)

Patch by Matthias Bussonnier.

(cherry picked from commit 160edb43571311a3785785c1dfa784afc52d87be)
---

diff --git a/Python/ceval.c b/Python/ceval.c
index c9e9c327f314..83667353af23 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2857,13 +2857,16 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
         TARGET(IMPORT_STAR) {
             PyObject *from = POP(), *locals;
             int err;
-            if (PyFrame_FastToLocalsWithError(f) < 0)
+            if (PyFrame_FastToLocalsWithError(f) < 0) {
+                Py_DECREF(from);
                 goto error;
+            }
 
             locals = f->f_locals;
             if (locals == NULL) {
                 PyErr_SetString(PyExc_SystemError,
                     "no locals found during 'import *'");
+                Py_DECREF(from);
                 goto error;
             }
             err = import_all_from(locals, from);