diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-12-11 10:18:03 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-12-11 10:18:03 (GMT) |
| commit | e3a26ef9f6be39f0a1a66a585f11e42d76f3a90a (patch) | |
| tree | c3a767cb7310c9c469cce09775f95bf06fc885e7 | |
| parent | 456e333da9e3ac1a98a2cbdd7fd0ae6b33f8362d (diff) | |
| parent | 2e57446fb4328d096e1c2174b206489a11676cee (diff) | |
| download | tcl-e3a26ef9f6be39f0a1a66a585f11e42d76f3a90a.zip tcl-e3a26ef9f6be39f0a1a66a585f11e42d76f3a90a.tar.gz tcl-e3a26ef9f6be39f0a1a66a585f11e42d76f3a90a.tar.bz2 | |
Fix [c9eb6b0ac01bb8ef96a616c71426a3db4a279bec|c9eb6b0ac0]: ConvertLocalToUTCUsingC fails the first time if TZ is not set
| -rw-r--r-- | generic/tclClock.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tclClock.c b/generic/tclClock.c index 9d4bcd6..949cb1c 100644 --- a/generic/tclClock.c +++ b/generic/tclClock.c @@ -2005,22 +2005,23 @@ ClockSecondsObjCmd( static void TzsetIfNecessary(void) { - static char *tzWas = NULL; /* Previous value of TZ, protected by + static char* tzWas = INT2PTR(-1); /* Previous value of TZ, protected by * clockMutex. */ const char *tzIsNow; /* Current value of TZ */ Tcl_MutexLock(&clockMutex); tzIsNow = getenv("TZ"); - if (tzIsNow != NULL && (tzWas == NULL || strcmp(tzIsNow, tzWas) != 0)) { + if (tzIsNow != NULL && (tzWas == NULL || tzWas == INT2PTR(-1) + || strcmp(tzIsNow, tzWas) != 0)) { tzset(); - if (tzWas != NULL) { + if (tzWas != NULL && tzWas != INT2PTR(-1)) { ckfree(tzWas); } tzWas = ckalloc(strlen(tzIsNow) + 1); strcpy(tzWas, tzIsNow); } else if (tzIsNow == NULL && tzWas != NULL) { tzset(); - ckfree(tzWas); + if (tzWas != INT2PTR(-1)) ckfree(tzWas); tzWas = NULL; } Tcl_MutexUnlock(&clockMutex); |