summaryrefslogtreecommitdiffstats
path: root/mac
diff options
context:
space:
mode:
authordas <das>2003-10-01 14:33:49 (GMT)
committerdas <das>2003-10-01 14:33:49 (GMT)
commitd49289c17822ead42e5cfe52143417e665af957e (patch)
tree809f8b662f2e114198443b478b32ebdbaf2dca4e /mac
parent62fbe6d3ac206f0bb0cfbcf84f9b60cc4a703970 (diff)
downloadtcl-d49289c17822ead42e5cfe52143417e665af957e.zip
tcl-d49289c17822ead42e5cfe52143417e665af957e.tar.gz
tcl-d49289c17822ead42e5cfe52143417e665af957e.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 3833a65..52b3587 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.16 2003/09/05 21:52:12 dgp Exp $
+ * RCS: @(#) $Id: tclMacResource.c,v 1.17 2003/10/01 14:33:49 das Exp $
*/
#include <Errors.h>
@@ -1497,7 +1497,7 @@ Tcl_MacFindResource(
Tcl_DStringFree(&ds);
}
- if (*resource == NULL) {
+ if (resource != NULL && *resource == NULL) {
*releaseIt = 1;
LoadResource(resource);
} else {