diff options
| author | andreas_kupries <akupries@shaw.ca> | 2006-10-11 21:32:12 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2006-10-11 21:32:12 (GMT) |
| commit | 782c6a62d40f4526b20e016d86fd09e3da3fe919 (patch) | |
| tree | 01b84e7284a5cfaa0c90c487c4805c2936ec0ac3 | |
| parent | ba0f0f3d224fe41e429498129101a52a55110e16 (diff) | |
| download | tcl-782c6a62d40f4526b20e016d86fd09e3da3fe919.zip tcl-782c6a62d40f4526b20e016d86fd09e3da3fe919.tar.gz tcl-782c6a62d40f4526b20e016d86fd09e3da3fe919.tar.bz2 | |
* generic/tclPkg.c (Tcl_PkgRequireEx): Corrected crash when
argument version==NULL passed in. Backport of the fix for the
same problem in 8.5.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/tclPkg.c | 20 |
2 files changed, 18 insertions, 8 deletions
@@ -1,3 +1,9 @@ +2006-10-11 Andreas Kupries <andreask@activestate.com> + + * generic/tclPkg.c (Tcl_PkgRequireEx): Corrected crash when + argument version==NULL passed in. Backport of the fix for the + same problem in 8.5. + 2006-10-10 Don Porter <dgp@users.sourceforge.net> *** 8.4.14 TAGGED FOR RELEASE *** diff --git a/generic/tclPkg.c b/generic/tclPkg.c index 052992a..8f1f413 100644 --- a/generic/tclPkg.c +++ b/generic/tclPkg.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclPkg.c,v 1.9.2.6 2006/09/22 18:31:54 andreas_kupries Exp $ + * RCS: @(#) $Id: tclPkg.c,v 1.9.2.7 2006/10/11 21:32:13 andreas_kupries Exp $ * * TIP #268. * Heavily rewritten to handle the extend version numbers, and extended @@ -332,15 +332,19 @@ Tcl_PkgRequireEx(interp, name, version, exact, clientDataPtr) #ifdef TCL_TIP268 /* Translate between old and new API, and defer to the new function. */ - if (exact) { - ov = ExactRequirement (version); + if (version == NULL) { + res = Tcl_PkgRequireProc(interp, name, 0, NULL, clientDataPtr); } else { - ov = Tcl_NewStringObj (version,-1); - } + if (exact) { + ov = ExactRequirement (version); + } else { + ov = Tcl_NewStringObj (version,-1); + } - Tcl_IncrRefCount (ov); - res = Tcl_PkgRequireProc(interp, name, 1, &ov, clientDataPtr); - Tcl_DecrRefCount (ov); + Tcl_IncrRefCount (ov); + res = Tcl_PkgRequireProc(interp, name, 1, &ov, clientDataPtr); + Tcl_DecrRefCount (ov); + } if (res != TCL_OK) { return NULL; |