diff options
| author | das <das> | 2003-10-01 14:34:16 (GMT) |
|---|---|---|
| committer | das <das> | 2003-10-01 14:34:16 (GMT) |
| commit | 7328a9cb5e4258e7fe66cf504a51a6f177e1c927 (patch) | |
| tree | 38db0b5ab5b9beb1ce91be5cd1eda0eabda61e68 | |
| parent | 727cc7ed58601550160c4b3dbc91bec67fec705f (diff) | |
| download | tcl-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).
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | mac/tclMacResource.c | 4 | ||||
| -rw-r--r-- | macosx/Makefile | 6 |
3 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,8 @@ +2003-10-01 Daniel Steffen <das@users.sourceforge.net> + + * macosx/Makefile: fixed redo prebinding bug when DESTDIR="". + * mac/tclMacResource.c: fixed possible NULL dereference (bdesgraupes). + 2003-09-29 Don Porter <dgp@users.sourceforge.net> * generic/tclBasic.c (CallCommandTraces): Added safety bit 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 { diff --git a/macosx/Makefile b/macosx/Makefile index 5be4a84..f3c8e02 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -3,7 +3,7 @@ # Makefile to build Tcl on Mac OS X packaged as a Framework # uses standard unix build system in tcl/unix # -# RCS: @(#) $Id: Makefile,v 1.5.2.4 2003/09/25 05:34:18 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.5.2.5 2003/10/01 14:34:16 das Exp $ # ######################################################################################################## @@ -26,7 +26,7 @@ BINDIR ?= ${PREFIX}/bin MANDIR ?= ${PREFIX}/man # set to non-empty value to install manpages in addition to html help: -INSTALL_MANPAGES ?= +INSTALL_MANPAGES ?= TCL_PACKAGE_PATH ?= "~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl \ ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks \ @@ -168,7 +168,7 @@ ifeq (${EMBEDDED_BUILD},1) -rmdir -p "${INSTALL_ROOT}${BINDIR}" 2>&- else # redo prebinding - cd ${INSTALL_ROOT}; \ + cd ${INSTALL_ROOT}/; \ if [ ! -d usr/lib ]; then mkdir -p usr; ln -fs /usr/lib usr/; RM_USRLIB=1; fi; \ if [ ! -d System ]; then ln -fs /System .; RM_SYSTEM=1; fi; \ redo_prebinding -r . "./${BINDIR}/${TCLSH}"; \ |