summaryrefslogtreecommitdiffstats
path: root/mac
diff options
context:
space:
mode:
authordas <das>2003-10-01 14:34:16 (GMT)
committerdas <das>2003-10-01 14:34:16 (GMT)
commit7328a9cb5e4258e7fe66cf504a51a6f177e1c927 (patch)
tree38db0b5ab5b9beb1ce91be5cd1eda0eabda61e68 /mac
parent727cc7ed58601550160c4b3dbc91bec67fec705f (diff)
downloadtcl-7328a9cb5e4258e7fe66cf504a51a6f177e1c927.zip
tcl-7328a9cb5e4258e7fe66cf504a51a6f177e1c927.tar.gz
tcl-7328a9cb5e4258e7fe66cf504a51a6f177e1c927.tar.bz2
* macosx/Makefile: fixed redo prebinding bug when DESTDIR="".
* mac/tclMacResource.c: fixed possible NULL dereference (bdesgraupes).
Diffstat (limited to 'mac')
-rw-r--r--mac/tclMacResource.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mac/tclMacResource.c b/mac/tclMacResource.c
index 78f0bc5..b4e9df4 100644
--- a/mac/tclMacResource.c
+++ b/mac/tclMacResource.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclMacResource.c,v 1.14 2002/06/05 11:59:49 das Exp $
+ * RCS: @(#) $Id: tclMacResource.c,v 1.14.2.1 2003/10/01 14:34:16 das Exp $
*/
#include <Errors.h>
@@ -1486,7 +1486,7 @@ Tcl_MacFindResource(
Tcl_DStringFree(&ds);
}
- if (*resource == NULL) {
+ if (resource != NULL && *resource == NULL) {
*releaseIt = 1;
LoadResource(resource);
} else {