diff options
| author | dkf <dkf@noemail.net> | 2005-01-07 11:16:28 (GMT) |
|---|---|---|
| committer | dkf <dkf@noemail.net> | 2005-01-07 11:16:28 (GMT) |
| commit | 2937e1da83e2ce9236e1ca5063c1187186be2013 (patch) | |
| tree | 36b0f791358a85eaa3758903efabfc5893bb6066 | |
| parent | cb83f36b71928cd8255f7bf3bd43089d8f8264d2 (diff) | |
| download | tk-2937e1da83e2ce9236e1ca5063c1187186be2013.zip tk-2937e1da83e2ce9236e1ca5063c1187186be2013.tar.gz tk-2937e1da83e2ce9236e1ca5063c1187186be2013.tar.bz2 | |
Add missing Tcl_ResetResult [697915]
FossilOrigin-Name: 487f4a26f72963d7120c8a6b65d2073e919fc9d6
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tkWindow.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2005-01-07 Donal K. Fellows <donal.k.fellows@man.ac.uk> + + * generic/tkWindow.c (GetScreen): Make sure the result is reset on + all error paths to stop strange errors. [Bug 697915] + 2005-01-05 Donal K. Fellows <donal.k.fellows@man.ac.uk> * doc/loadTk.n, doc/toplevel.n: Convert to other form of emacs diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 53d4a8c..35a16cc 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWindow.c,v 1.56.2.4 2004/10/27 00:37:38 davygrvy Exp $ + * RCS: @(#) $Id: tkWindow.c,v 1.56.2.5 2005/01/07 11:16:29 dkf Exp $ */ #include "tkPort.h" @@ -485,6 +485,7 @@ GetScreen(interp, screenName, screenPtr) */ dispPtr = TkpOpenDisplay(screenName); if (dispPtr == NULL) { + Tcl_ResetResult(interp); Tcl_AppendResult(interp, "couldn't connect to display \"", screenName, "\"", (char *) NULL); return (TkDisplay *) NULL; |