Fix refleak: PyObject_GetItem returns a new reference, not a borrowed one like PyDict_GetItem.

pitrou · pitrou · commit bf35c156b48b · 2012-04-19T18:21:04.000+02:00
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -1940,6 +1940,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
                                     "__build_class__ not found");
                     break;
                 }
+                Py_INCREF(x);
             }
             else {
                 PyObject *build_class_str = _PyUnicode_FromId(&PyId___build_class__);
@@ -1953,7 +1954,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
                     break;
                 }
             }
-            Py_INCREF(x);
             PUSH(x);
             break;
         }
@@ -2092,6 +2092,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
             }
             if (x == NULL) {
                 x = PyDict_GetItem(f->f_globals, w);
+                Py_XINCREF(x);
                 if (x == NULL) {
                     if (PyDict_CheckExact(f->f_builtins)) {
                         x = PyDict_GetItem(f->f_builtins, w);
@@ -2101,6 +2102,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
                                         NAME_ERROR_MSG, w);
                             break;
                         }
+                        Py_INCREF(x);
                     }
                     else {
                         x = PyObject_GetItem(f->f_builtins, w);
@@ -2113,7 +2115,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
                         }
                     }
                 }
-                Py_INCREF(x);
             }
             PUSH(x);
             DISPATCH();
@@ -2186,7 +2187,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
                     break;
                 }
             }
-            Py_INCREF(x);
             PUSH(x);
             DISPATCH();
 

Original file line number	Diff line number	Diff line change
`@@ -1940,6 +1940,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)`
`1940`	`1940`	`"__build_class__ not found");`
`1941`	`1941`	`break;`
`1942`	`1942`	`}`
	`1943`	`+ Py_INCREF(x);`
`1943`	`1944`	`}`
`1944`	`1945`	`else {`
`1945`	`1946`	`PyObject *build_class_str = _PyUnicode_FromId(&PyId___build_class__);`
`@@ -1953,7 +1954,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)`
`1953`	`1954`	`break;`
`1954`	`1955`	`}`
`1955`	`1956`	`}`
`1956`		`- Py_INCREF(x);`
`1957`	`1957`	`PUSH(x);`
`1958`	`1958`	`break;`
`1959`	`1959`	`}`
`@@ -2092,6 +2092,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)`
`2092`	`2092`	`}`
`2093`	`2093`	`if (x == NULL) {`
`2094`	`2094`	`x = PyDict_GetItem(f->f_globals, w);`
	`2095`	`+ Py_XINCREF(x);`
`2095`	`2096`	`if (x == NULL) {`
`2096`	`2097`	`if (PyDict_CheckExact(f->f_builtins)) {`
`2097`	`2098`	`x = PyDict_GetItem(f->f_builtins, w);`
`@@ -2101,6 +2102,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)`
`2101`	`2102`	`NAME_ERROR_MSG, w);`
`2102`	`2103`	`break;`
`2103`	`2104`	`}`
	`2105`	`+ Py_INCREF(x);`
`2104`	`2106`	`}`
`2105`	`2107`	`else {`
`2106`	`2108`	`x = PyObject_GetItem(f->f_builtins, w);`
`@@ -2113,7 +2115,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)`
`2113`	`2115`	`}`
`2114`	`2116`	`}`
`2115`	`2117`	`}`
`2116`		`- Py_INCREF(x);`
`2117`	`2118`	`}`
`2118`	`2119`	`PUSH(x);`
`2119`	`2120`	`DISPATCH();`
`@@ -2186,7 +2187,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)`
`2186`	`2187`	`break;`
`2187`	`2188`	`}`
`2188`	`2189`	`}`
`2189`		`- Py_INCREF(x);`
`2190`	`2190`	`PUSH(x);`
`2191`	`2191`	`DISPATCH();`
`2192`	`2192`