diff options
| author | Miguel Sofer <miguel.sofer@gmail.com> | 2009-04-30 23:25:32 (GMT) |
|---|---|---|
| committer | Miguel Sofer <miguel.sofer@gmail.com> | 2009-04-30 23:25:32 (GMT) |
| commit | 7b070a7c3c4ebcf234242d7a3dc3d6e84fad44a9 (patch) | |
| tree | 6b2a0d8bb0cbcba467f0786cc2c085e2430fa513 | |
| parent | fc14cb7392349efcc99e221cefa6f328f0c9de2a (diff) | |
| download | tcl-7b070a7c3c4ebcf234242d7a3dc3d6e84fad44a9.zip tcl-7b070a7c3c4ebcf234242d7a3dc3d6e84fad44a9.tar.gz tcl-7b070a7c3c4ebcf234242d7a3dc3d6e84fad44a9.tar.bz2 | |
* generic/tclBasic.c (TclObjInvoke): Make sure that a null objProc
is not used, use Tcl_NRCallObjProc instead [Bug 2486550].
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tclBasic.c | 9 |
2 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2009-04-30 Miguel Sofer <msofer@users.sf.net> + + * generic/tclBasic.c (TclObjInvoke): Make sure that a null objProc + is not used, use Tcl_NRCallObjProc instead [Bug 2486550]. + 2009-05-01 Jan Nijtmans <nijtmans@users.sf.net> * win/configure.in Fix 64-bit detection for zlib on Win64 diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 919a031..d5aad5d 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -16,7 +16,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclBasic.c,v 1.391 2009/03/22 14:46:28 msofer Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.392 2009/04/30 23:25:32 msofer Exp $ */ #include "tclInt.h" @@ -6421,7 +6421,12 @@ TclObjInvoke( */ iPtr->cmdCount++; - result = cmdPtr->objProc(cmdPtr->objClientData, interp, objc, objv); + if (cmdPtr->objProc != NULL) { + result = cmdPtr->objProc(cmdPtr->objClientData, interp, objc, objv); + } else { + result = Tcl_NRCallObjProc(interp, cmdPtr->nreProc, + cmdPtr->objClientData, objc, objv); + } /* * If an error occurred, record information about what was being executed |