bpo-34794: Fix a leak in Tkinter. (GH-10025)

serhiy-storchaka · web-flow · commit df13df41a257 · 2018-10-23T22:40:54.000+03:00
Based on the investigation by Xiang Zhang.
diff --git a/Misc/NEWS.d/next/Library/2018-10-21-14-53-19.bpo-34794.yt3R4-.rst b/Misc/NEWS.d/next/Library/2018-10-21-14-53-19.bpo-34794.yt3R4-.rst
@@ -0,0 +1,2 @@
+Fixed a leak in Tkinter when pass the Python wrapper around Tcl_Obj back to
+Tcl/Tk.
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
@@ -1101,9 +1101,7 @@ AsObj(PyObject *value)
     }
 
     if (PyTclObject_Check(value)) {
-        Tcl_Obj *v = ((PyTclObject*)value)->value;
-        Tcl_IncrRefCount(v);
-        return v;
+        return ((PyTclObject*)value)->value;
     }
 
     {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fixed a leak in Tkinter when pass the Python wrapper around Tcl_Obj back to`
	`2`	`+Tcl/Tk.`
Original file line number	Diff line number	Diff line change
`@@ -1101,9 +1101,7 @@ AsObj(PyObject *value)`
`1101`	`1101`	`}`
`1102`	`1102`
`1103`	`1103`	`if (PyTclObject_Check(value)) {`
`1104`		`- Tcl_Obj v = ((PyTclObject)value)->value;`
`1105`		`- Tcl_IncrRefCount(v);`
`1106`		`- return v;`
	`1104`	`+ return ((PyTclObject*)value)->value;`
`1107`	`1105`	`}`
`1108`	`1106`
`1109`	`1107`	`{`