From: Antony Dovgal <tony2001@php.net>
Date: Sat, 9 Aug 2008 22:01:35 +0000 (+0000)
Subject: MFH: do not fail & segfault if malloc(0) returns NULL, that's expected
X-Git-Tag: php-5.2.7RC1~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1dd367b62d25b878266d3cc6ee031cc19a0f68e8;p=php

MFH: do not fail & segfault if malloc(0) returns NULL, that's expected
---

diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
index c3fc9f9d67..469cff4680 100644
--- a/ext/date/lib/parse_tz.c
+++ b/ext/date/lib/parse_tz.c
@@ -125,46 +125,52 @@ static void read_types(char **tzf, timelib_tzinfo *tz)
 	memcpy(tz->timezone_abbr, *tzf, sizeof(char) * tz->charcnt);
 	*tzf += sizeof(char) * tz->charcnt;
 
-	leap_buffer = (int32_t *) malloc(tz->leapcnt * 2 * sizeof(int32_t));
-	if (!leap_buffer) {
-		return;
-	}
-	memcpy(leap_buffer, *tzf, sizeof(int32_t) * tz->leapcnt * 2);
-	*tzf += sizeof(int32_t) * tz->leapcnt * 2;
+	if (tz->leapcnt) {
+		leap_buffer = (int32_t *) malloc(tz->leapcnt * 2 * sizeof(int32_t));
+		if (!leap_buffer) {
+			return;
+		}
+		memcpy(leap_buffer, *tzf, sizeof(int32_t) * tz->leapcnt * 2);
+		*tzf += sizeof(int32_t) * tz->leapcnt * 2;
 
-	tz->leap_times = (tlinfo*) malloc(tz->leapcnt * sizeof(tlinfo));
-	if (!tz->leap_times) {
-		return;
-	}
-	for (i = 0; i < tz->leapcnt; i++) {
-		tz->leap_times[i].trans = timelib_conv_int(leap_buffer[i * 2]);
-		tz->leap_times[i].offset = timelib_conv_int(leap_buffer[i * 2 + 1]);
-	}
-	free(leap_buffer);
-	
-	buffer = (unsigned char*) malloc(tz->ttisstdcnt * sizeof(unsigned char));
-	if (!buffer) {
-		return;
+		tz->leap_times = (tlinfo*) malloc(tz->leapcnt * sizeof(tlinfo));
+		if (!tz->leap_times) {
+			return;
+		}
+		for (i = 0; i < tz->leapcnt; i++) {
+			tz->leap_times[i].trans = timelib_conv_int(leap_buffer[i * 2]);
+			tz->leap_times[i].offset = timelib_conv_int(leap_buffer[i * 2 + 1]);
+		}
+		free(leap_buffer);
 	}
-	memcpy(buffer, *tzf, sizeof(unsigned char) * tz->ttisstdcnt);
-	*tzf += sizeof(unsigned char) * tz->ttisstdcnt;
 
-	for (i = 0; i < tz->ttisstdcnt; i++) {
-		tz->type[i].isstdcnt = buffer[i];
-	}
-	free(buffer);
+	if (tz->ttisstdcnt) {
+		buffer = (unsigned char*) malloc(tz->ttisstdcnt * sizeof(unsigned char));
+		if (!buffer) {
+			return;
+		}
+		memcpy(buffer, *tzf, sizeof(unsigned char) * tz->ttisstdcnt);
+		*tzf += sizeof(unsigned char) * tz->ttisstdcnt;
 
-	buffer = (unsigned char*) malloc(tz->ttisgmtcnt * sizeof(unsigned char));
-	if (!buffer) {
-		return;
+		for (i = 0; i < tz->ttisstdcnt; i++) {
+			tz->type[i].isstdcnt = buffer[i];
+		}
+		free(buffer);
 	}
-	memcpy(buffer, *tzf, sizeof(unsigned char) * tz->ttisgmtcnt);
-	*tzf += sizeof(unsigned char) * tz->ttisgmtcnt;
 
-	for (i = 0; i < tz->ttisgmtcnt; i++) {
-		tz->type[i].isgmtcnt = buffer[i];
+	if (tz->ttisgmtcnt) {
+		buffer = (unsigned char*) malloc(tz->ttisgmtcnt * sizeof(unsigned char));
+		if (!buffer) {
+			return;
+		}
+		memcpy(buffer, *tzf, sizeof(unsigned char) * tz->ttisgmtcnt);
+		*tzf += sizeof(unsigned char) * tz->ttisgmtcnt;
+
+		for (i = 0; i < tz->ttisgmtcnt; i++) {
+			tz->type[i].isgmtcnt = buffer[i];
+		}
+		free(buffer);
 	}
-	free(buffer);
 }
 
 void timelib_dump_tzinfo(timelib_tzinfo *tz)