summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrjohnson <rjohnson>1999-04-17 02:35:37 (GMT)
committerrjohnson <rjohnson>1999-04-17 02:35:37 (GMT)
commitcb916de9253cefd5b1dc519afc76fd1b2a2fae51 (patch)
tree2e517b96b63ac85ee8dd2a5a1ab936b11e02a87c
parentf6578ca565864599b061ed0ce8243adaa213e987 (diff)
downloadtk-cb916de9253cefd5b1dc519afc76fd1b2a2fae51.zip
tk-cb916de9253cefd5b1dc519afc76fd1b2a2fae51.tar.gz
tk-cb916de9253cefd5b1dc519afc76fd1b2a2fae51.tar.bz2
Fixed bug 1853 - called NULL interp.
-rw-r--r--generic/tkImgBmap.c9
-rw-r--r--generic/tkText.c3
2 files changed, 8 insertions, 4 deletions
diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c
index 093abac..2a06702 100644
--- a/generic/tkImgBmap.c
+++ b/generic/tkImgBmap.c
@@ -5,11 +5,12 @@
*
* Copyright (c) 1994 The Regents of the University of California.
* Copyright (c) 1994-1997 Sun Microsystems, Inc.
+ * Copyright (c) 1999 by Scriptics Corporation.
*
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkImgBmap.c,v 1.6 1999/04/16 01:51:15 stanton Exp $
+ * RCS: @(#) $Id: tkImgBmap.c,v 1.7 1999/04/17 02:35:37 rjohnson Exp $
*/
#include "tkInt.h"
@@ -630,8 +631,10 @@ TkGetBitmapData(interp, string, fileName, widthPtr, heightPtr,
return data;
error:
- Tcl_SetResult(interp, "format error in bitmap data", TCL_STATIC);
-
+ if (interp != NULL) {
+ Tcl_SetResult(interp, "format error in bitmap data", TCL_STATIC);
+ }
+
errorCleanup:
if (data != NULL) {
ckfree(data);
diff --git a/generic/tkText.c b/generic/tkText.c
index 74181a4..ff08140 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -9,11 +9,12 @@
*
* Copyright (c) 1992-1994 The Regents of the University of California.
* Copyright (c) 1994-1996 Sun Microsystems, Inc.
+ * Copyright (c) 1999 by Scriptics Corporation.
*
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkText.c,v 1.4 1999/04/17 02:31:20 rjohnson Exp $
+ * RCS: @(#) $Id: tkText.c,v 1.5 1999/04/17 02:35:38 rjohnson Exp $
*/
#include "default.h"