summaryrefslogtreecommitdiff
path: root/stdtime/localtime.c
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2003-09-21 15:23:54 +0000
committerMark Spencer <markster@digium.com>2003-09-21 15:23:54 +0000
commit7c59caf852b49fb27b1df91b1d2b5ab687677add (patch)
tree05484446e05602d221b05eed5e31aa77fc1c9946 /stdtime/localtime.c
parent27787e21eca6aedff76bae7d38b47f999753f6da (diff)
Merge tilghman's patches
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1536 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'stdtime/localtime.c')
-rwxr-xr-xstdtime/localtime.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/stdtime/localtime.c b/stdtime/localtime.c
index 18a1b597c..276eb9f97 100755
--- a/stdtime/localtime.c
+++ b/stdtime/localtime.c
@@ -981,11 +981,14 @@ const char * const zone;
sp = lclptr;
/* Find the right zone record */
- while (sp != NULL) {
- if (!strcmp(sp->name,zone))
- break;
- sp = sp->next;
- }
+ if (zone == NULL)
+ sp = NULL;
+ else
+ while (sp != NULL) {
+ if (!strcmp(sp->name,zone))
+ break;
+ sp = sp->next;
+ }
if (sp == NULL) {
ast_tzsetwall();