aboutsummaryrefslogtreecommitdiffstats
path: root/stdtime/localtime.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-09-21 15:23:54 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-09-21 15:23:54 +0000
commit5fe638a937ffdb8c82714a5a32802de9ca456b32 (patch)
tree05484446e05602d221b05eed5e31aa77fc1c9946 /stdtime/localtime.c
parentbfdcf22d5b97efb4c059d38d91fe361d41518cd3 (diff)
Merge tilghman's patches
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1536 f38db490-d61c-443f-a65b-d21fe96a405b
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();