update previous trans if current is lower or eq than begin

Author: marc-mabe

ext/date/php_date.c

@@ -4276,13 +4276,13 @@ PHP_FUNCTION(timezone_transitions_get)
 		RETURN_FALSE;
 	}
 
-#define add_nominal() \
+#define add_by_index(i,ts) \
 		array_init_size(&element, 5); \
-		add_assoc_long(&element, "ts",     timestamp_begin); \
-		add_assoc_str(&element, "time", php_format_date(DATE_FORMAT_ISO8601_LARGE_YEAR, 13, timestamp_begin, 0)); \
-		add_assoc_long(&element, "offset", tzobj->tzi.tz->type[0].offset); \
-		add_assoc_bool(&element, "isdst",  tzobj->tzi.tz->type[0].isdst); \
-		add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[0].abbr_idx]); \
+		add_assoc_long(&element, "ts",     ts); \
+		add_assoc_str(&element, "time", php_format_date(DATE_FORMAT_ISO8601_LARGE_YEAR, 13, ts, 0)); \
+		add_assoc_long(&element, "offset", tzobj->tzi.tz->type[i].offset); \
+		add_assoc_bool(&element, "isdst",  tzobj->tzi.tz->type[i].isdst); \
+		add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[i].abbr_idx]); \
 		add_next_index_zval(return_value, &element);
 
 #define add(i,ts) \
@@ -4294,14 +4294,13 @@ PHP_FUNCTION(timezone_transitions_get)
 		add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].abbr_idx]); \
 		add_next_index_zval(return_value, &element);
 
-#define add_by_index(i,ts) \
-		array_init_size(&element, 5); \
+#define upd_prev(i,ts) \
+		element = *ZEND_HASH_ELEMENT(Z_ARRVAL_P(return_value), Z_ARRVAL_P(return_value)->nNumUsed-1); \
 		add_assoc_long(&element, "ts",     ts); \
 		add_assoc_str(&element, "time", php_format_date(DATE_FORMAT_ISO8601_LARGE_YEAR, 13, ts, 0)); \
-		add_assoc_long(&element, "offset", tzobj->tzi.tz->type[i].offset); \
-		add_assoc_bool(&element, "isdst",  tzobj->tzi.tz->type[i].isdst); \
-		add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[i].abbr_idx]); \
-		add_next_index_zval(return_value, &element);
+		add_assoc_long(&element, "offset", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].offset); \
+		add_assoc_bool(&element, "isdst",  tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].isdst); \
+		add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].abbr_idx]);
 
 #define add_from_tto(to,ts) \
 		array_init_size(&element, 5); \
@@ -4312,6 +4311,7 @@ PHP_FUNCTION(timezone_transitions_get)
 		add_assoc_string(&element, "abbr", (to)->abbr); \
 		add_next_index_zval(return_value, &element);
 
+#define add_nominal() add_by_index(0, timestamp_begin)
 #define add_last() add(tzobj->tzi.tz->bit64.timecnt - 1, timestamp_begin)
 
 	array_init(return_value);
@@ -4364,10 +4364,11 @@ PHP_FUNCTION(timezone_transitions_get)
 
 			if (tzobj->tzi.tz->trans[i] > timestamp_begin) {
 				add(i, tzobj->tzi.tz->trans[i]);
+				last_transition_ts = tzobj->tzi.tz->trans[i];
+			} else {
+				upd_prev(i, timestamp_begin);
 			}
 		}
-
-		last_transition_ts = tzobj->tzi.tz->trans[tzobj->tzi.tz->bit64.timecnt - 1];
 	}
 
 	if (tzobj->tzi.tz->posix_info && tzobj->tzi.tz->posix_info->dst_end) {

ext/date/tests/gh18051-32bit.phpt

@@ -0,0 +1,52 @@
+--TEST--
+Bug GH-18051 (Interger overflow on 32bit)
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) die("skip 32-bit only");
+--FILE--
+<?php
+
+$tz = new DateTimeZone('America/New_York');
+var_dump(array_slice($tz->getTransitions(), 0, 3));
+
+--EXPECT--
+array(3) {
+  [0]=>
+  array(5) {
+    ["ts"]=>
+    int(-2147483648)
+    ["time"]=>
+    string(25) "1901-12-13T20:45:52+00:00"
+    ["offset"]=>
+    int(-18000)
+    ["isdst"]=>
+    bool(false)
+    ["abbr"]=>
+    string(3) "EST"
+  }
+  [1]=>
+  array(5) {
+    ["ts"]=>
+    int(-1633280400)
+    ["time"]=>
+    string(25) "1918-03-31T07:00:00+00:00"
+    ["offset"]=>
+    int(-14400)
+    ["isdst"]=>
+    bool(true)
+    ["abbr"]=>
+    string(3) "EDT"
+  }
+  [2]=>
+  array(5) {
+    ["ts"]=>
+    int(-1615140000)
+    ["time"]=>
+    string(25) "1918-10-27T06:00:00+00:00"
+    ["offset"]=>
+    int(-18000)
+    ["isdst"]=>
+    bool(false)
+    ["abbr"]=>
+    string(3) "EST"
+  }
+}