summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2015-06-01 18:30:54 (GMT)
committerfvogel <fvogelnew1@free.fr>2015-06-01 18:30:54 (GMT)
commit0a4cb74f1cd2e3189d3c59cdcfbc5c0f69ba5761 (patch)
tree920a4a334af45292ce58ff5bd6b782aabccee817
parentf0cfd95b355f536f0d9a4139138e99447a7bd127 (diff)
parentc61c12b4b2317fbb1cd2fbc294078d661c2a333c (diff)
downloadtk-0a4cb74f1cd2e3189d3c59cdcfbc5c0f69ba5761.zip
tk-0a4cb74f1cd2e3189d3c59cdcfbc5c0f69ba5761.tar.gz
tk-0a4cb74f1cd2e3189d3c59cdcfbc5c0f69ba5761.tar.bz2
Fixed bug [2368195fff] - More correct error handling when calling paneconfigure with a non existing window
-rw-r--r--generic/tkPanedWindow.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index e07fc51..81bcbb0 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,