Skip to content

Commit 3aa030e

Browse files
committed
Merge branch 'PHP-7.2'
* PHP-7.2: Sync fix for bug #72498 for 32-bit
2 parents 658a23a + 2115878 commit 3aa030e

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

ext/com_dotnet/com_variant.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,13 +1011,13 @@ PHP_FUNCTION(variant_date_from_timestamp)
10111011
tzset();
10121012
ttstamp = timestamp;
10131013
tmv = localtime(&ttstamp);
1014-
#if ZEND_ENABLE_ZVAL_LONG64
1014+
10151015
/* Invalid after 23:59:59, December 31, 3000, UTC */
10161016
if (!tmv) {
10171017
php_error_docref(NULL, E_WARNING, "Invalid timestamp " ZEND_LONG_FMT, timestamp);
10181018
RETURN_FALSE;
10191019
}
1020-
#endif
1020+
10211021
memset(&systime, 0, sizeof(systime));
10221022

10231023
systime.wDay = tmv->tm_mday;

ext/com_dotnet/tests/bug72498.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Bug #72498 variant_date_from_timestamp null dereference
33
--SKIPIF--
44
<?php # vim:ft=php
55
if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present";
6-
if (PHP_INT_SIZE != 8) print "skip 64-bit only";
76
?>
87
--FILE--
98
<?php

0 commit comments

Comments
 (0)