diff options
| author | Anatol Belski <ab@php.net> | 2018-04-03 17:25:13 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-04-03 17:25:13 +0200 |
| commit | 2115878aaac23cfa36d583995aeb888c236064a5 (patch) | |
| tree | 252b1c799d91c478ac00390a9d86449fb27f5b48 | |
| parent | 062f93c93e6aeeda4bedbfcd9a100ab8e01f2180 (diff) | |
| parent | 821f13fd7958caac1e7a605d0df8ad8718fdb699 (diff) | |
| download | php-git-2115878aaac23cfa36d583995aeb888c236064a5.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync fix for bug #72498 for 32-bit
| -rw-r--r-- | ext/com_dotnet/com_variant.c | 4 | ||||
| -rw-r--r-- | ext/com_dotnet/tests/bug72498.phpt | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c index 4cfe72fc99..a746d61837 100644 --- a/ext/com_dotnet/com_variant.c +++ b/ext/com_dotnet/com_variant.c @@ -1012,13 +1012,13 @@ PHP_FUNCTION(variant_date_from_timestamp) tzset(); ttstamp = timestamp; tmv = localtime(&ttstamp); -#if ZEND_ENABLE_ZVAL_LONG64 + /* Invalid after 23:59:59, December 31, 3000, UTC */ if (!tmv) { php_error_docref(NULL, E_WARNING, "Invalid timestamp " ZEND_LONG_FMT, timestamp); RETURN_FALSE; } -#endif + memset(&systime, 0, sizeof(systime)); systime.wDay = tmv->tm_mday; diff --git a/ext/com_dotnet/tests/bug72498.phpt b/ext/com_dotnet/tests/bug72498.phpt index e155735ba5..c5aad0cccc 100644 --- a/ext/com_dotnet/tests/bug72498.phpt +++ b/ext/com_dotnet/tests/bug72498.phpt @@ -3,7 +3,6 @@ Bug #72498 variant_date_from_timestamp null dereference --SKIPIF-- <?php # vim:ft=php if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; -if (PHP_INT_SIZE != 8) print "skip 64-bit only"; ?> --FILE-- <?php |