diff options
| -rw-r--r-- | main/stdtime/localtime.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c index effb987cb..e54f2affd 100644 --- a/main/stdtime/localtime.c +++ b/main/stdtime/localtime.c @@ -61,6 +61,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/localtime.h" +#include "asterisk/strings.h" #ifndef lint #ifndef NOID @@ -1055,7 +1056,7 @@ const char * const zone; #ifdef _THREAD_SAFE ast_mutex_lock(&lcl_mutex); #endif - ast_tzset(zone); + ast_tzset(ast_strlen_zero(zone) ? "/etc/localtime" : zone); localsub(timep, 0L, p_tm, zone); #ifdef _THREAD_SAFE ast_mutex_unlock(&lcl_mutex); @@ -1495,8 +1496,8 @@ const char * const zone; #ifdef _THREAD_SAFE ast_mutex_lock(&lcl_mutex); #endif - ast_tzset(zone); - mktime_return_value = time1(tmp, localsub, 0L, zone); + ast_tzset(!ast_strlen_zero(zone) ? zone : "/etc/localtime"); + mktime_return_value = time1(tmp, localsub, 0L, !ast_strlen_zero(zone) ? zone : "/etc/localtime"); #ifdef _THREAD_SAFE ast_mutex_unlock(&lcl_mutex); #endif |