summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogel@noemail.net>2015-05-24 23:11:56 (GMT)
committerfvogel <fvogel@noemail.net>2015-05-24 23:11:56 (GMT)
commitd37234115a286e14a97cb1b451dc09e580cec57b (patch)
tree5deae2fa1d75180f313b46dacd8b68c8516a26f3
parent70059ee84651adcefcd2c5633e78f4db5550b85e (diff)
downloadtk-d37234115a286e14a97cb1b451dc09e580cec57b.zip
tk-d37234115a286e14a97cb1b451dc09e580cec57b.tar.gz
tk-d37234115a286e14a97cb1b451dc09e580cec57b.tar.bz2
More correct error handling when calling paneconfigure with a non existing window
FossilOrigin-Name: ec51b67326affe3db7b878d6bbf8413fe57503ef
-rw-r--r--generic/tkPanedWindow.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index 3ae473a..c79be25 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.c
@@ -678,6 +678,15 @@ PanedWindowWidgetObjCmd(
if (objc <= 4) {
tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]),
pwPtr->tkwin);
+ if (tkwin == NULL) {
+ /*
+ * Just a plain old bad window; Tk_NameToWindow filled in an
+ * error message for us.
+ */
+
+ result = TCL_ERROR;
+ break;
+ }
for (i = 0; i < pwPtr->numSlaves; i++) {
if (pwPtr->slaves[i]->tkwin == tkwin) {
resultObj = Tk_GetOptionInfo(interp,