php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix GH-14732: date_sun_info() fails for non-finite values
This commit is contained in:
Christoph M. Becker
2024-11-01 23:48:22 +01:00
parent 3245a65034 8df513336a
commit 68d3000902
3 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -10,6 +10,9 @@ PHP NEWS
. Fixed bug GH-16615 (Assertion failure in zend_std_read_property). (Arnaud)
. Fixed bug GH-16342 (Added ReflectionProperty::isLazy()). (Arnaud)
- Date:
. Fixed bug GH-14732 (date_sun_info() fails for non-finite values). (cmb)
- DOM:
. Fixed bug GH-16594 (Assertion failure in DOM -> before). (nielsdos)
. Fixed bug GH-16593 (Assertion failure in DOM->replaceChild). (nielsdos)

13
ext/date/php_date.c
View File

@@ -5526,6 +5526,10 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, bool calc_s
}
altitude = 90 - zenith;
if (!zend_finite(latitude) || !zend_finite(longitude)) {
RETURN_FALSE;
}
/* Initialize time struct */
tzi = get_timezone_info();
if (!tzi) {
@@ -5603,6 +5607,15 @@ PHP_FUNCTION(date_sun_info)
Z_PARAM_DOUBLE(longitude)
ZEND_PARSE_PARAMETERS_END();
if (!zend_finite(latitude)) {
zend_argument_value_error(2, "must be finite");
RETURN_THROWS();
}
if (!zend_finite(longitude)) {
zend_argument_value_error(3, "must be finite");
RETURN_THROWS();
}
/* Initialize time struct */
tzi = get_timezone_info();
if (!tzi) {

42
ext/date/tests/gh14732.phpt Normal file
View File

@@ -0,0 +1,42 @@
--TEST--
GH-14732 (date_sun_info() fails for non-finite values)
--FILE--
<?php
try {
date_sun_info(1, NAN, 1);
} catch (ValueError $ex) {
echo $ex->getMessage(), "\n";
}
try {
date_sun_info(1, -INF, 1);
} catch (ValueError $ex) {
echo $ex->getMessage(), "\n";
}
try {
date_sun_info(1, 1, NAN);
} catch (ValueError $ex) {
echo $ex->getMessage(), "\n";
}
try {
date_sun_info(1, 1, INF);
} catch (ValueError $ex) {
echo $ex->getMessage(), "\n";
}
var_dump(date_sunset(1, SUNFUNCS_RET_STRING, NAN, 1));
var_dump(date_sunrise(1, SUNFUNCS_RET_STRING, 1, NAN));
?>
--EXPECTF--
date_sun_info(): Argument #2 ($latitude) must be finite
date_sun_info(): Argument #2 ($latitude) must be finite
date_sun_info(): Argument #3 ($longitude) must be finite
date_sun_info(): Argument #3 ($longitude) must be finite
Deprecated: Constant SUNFUNCS_RET_STRING is deprecated in %s on line %d
Deprecated: Function date_sunset() is deprecated since 8.1, use date_sun_info() instead in %s on line %d
bool(false)
Deprecated: Constant SUNFUNCS_RET_STRING is deprecated in %s on line %d
Deprecated: Function date_sunrise() is deprecated since 8.1, use date_sun_info() instead in %s on line %d
bool(false)