From: Sascha Schumann <sas@php.net>
Date: Sat, 24 Feb 2001 21:18:28 +0000 (+0000)
Subject: Don't assume that tzname exists, if tm_zone does not exist.
X-Git-Tag: php-4.0.5RC1~170
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b37b5f93aaa5947d7cb396e021289d42a2e46beb;p=php

Don't assume that tzname exists, if tm_zone does not exist.

PR: #9380
---

diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index b022e57fce..1207a578cf 100644
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -260,7 +260,7 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm)
 			case 'T':		/* timezone name */
 #if HAVE_TM_ZONE
 				size += strlen(ta->tm_zone);
-#else
+#elif HAVE_TZNAME
 				size += strlen(tzname[0]);
 #endif
 				break;
@@ -452,7 +452,7 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm)
 			case 'T':		/* timezone name */
 #if HAVE_TM_ZONE
 				strcat(return_value->value.str.val, ta->tm_zone);
-#else
+#elif HAVE_TZNAME
 				strcat(return_value->value.str.val, tzname[0]);
 #endif
 				break;