summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvasiljevic <zv@archiware.com>2005-10-04 18:33:30 (GMT)
committervasiljevic <zv@archiware.com>2005-10-04 18:33:30 (GMT)
commitf7a32bb02e999e8cd6df51c36d894a5847c7030d (patch)
tree05410b6db8bbaed600af3b09065762e4d056baba
parent3a1cc7cd8ece0078e527499a541f9d4703012d95 (diff)
downloadtcl-f7a32bb02e999e8cd6df51c36d894a5847c7030d.zip
tcl-f7a32bb02e999e8cd6df51c36d894a5847c7030d.tar.gz
tcl-f7a32bb02e999e8cd6df51c36d894a5847c7030d.tar.bz2
Tcl_DeleteTimerHandler(): bail out early if passed NULL argument.
-rw-r--r--generic/tclTimer.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/generic/tclTimer.c b/generic/tclTimer.c
index e441867..faf44b7 100644
--- a/generic/tclTimer.c
+++ b/generic/tclTimer.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclTimer.c,v 1.18 2005/09/15 16:40:02 dgp Exp $
+ * RCS: @(#) $Id: tclTimer.c,v 1.19 2005/10/04 18:33:30 vasiljevic Exp $
*/
#include "tclInt.h"
@@ -345,9 +345,12 @@ Tcl_DeleteTimerHandler(token)
* Tcl_DeleteTimerHandler. */
{
register TimerHandler *timerHandlerPtr, *prevPtr;
- ThreadSpecificData *tsdPtr;
+ ThreadSpecificData *tsdPtr = InitTimer();
+
+ if (token == NULL) {
+ return;
+ }
- tsdPtr = InitTimer();
for (timerHandlerPtr = tsdPtr->firstTimerHandlerPtr, prevPtr = NULL;
timerHandlerPtr != NULL; prevPtr = timerHandlerPtr,
timerHandlerPtr = timerHandlerPtr->nextPtr) {