From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 3 Oct 2003 17:12:26 +0000 (+0000)
Subject: Check for TclError when reading variables. Fixes #807314.
X-Git-Tag: v2.4a1~1468
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d46e684edd5b75f9674af2acd730c1a2f03655ed;p=python

Check for TclError when reading variables. Fixes #807314.
Backported to 2.3.
---

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 5253a10603..02e4feb47f 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1647,11 +1647,15 @@ GetVar(PyObject *self, PyObject *args, int flags)
 	ENTER_TCL
 	tres = Tcl_GetVar2Ex(Tkapp_Interp(self), name1, name2, flags);
 	ENTER_OVERLAP
-	if (((TkappObject*)self)->wantobjects) {
-		res = FromObj(self, tres);
-	}
-	else {
-		res = PyString_FromString(Tcl_GetString(tres));
+	if (tres == NULL) {
+		PyErr_SetString(Tkinter_TclError, Tcl_GetStringResult(Tkapp_Interp(self)));
+	} else {
+		if (((TkappObject*)self)->wantobjects) {
+			res = FromObj(self, tres);
+		}
+		else {
+			res = PyString_FromString(Tcl_GetString(tres));
+		}
 	}
 	LEAVE_OVERLAP_TCL
 	return res;