Fix GH-15964: printf() can strip sign of -INF

We need to cater to negative infinity explicitly.

Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>

Closes GH-15965.
This commit is contained in:
divinity76 2024-09-21 08:44:02 +02:00 committed by Christoph M. Becker
parent 03bb112fb2
commit c2d3734e89
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 9 additions and 3 deletions

1
NEWS
View file

@ -15,6 +15,7 @@ PHP NEWS
skipLazyInitialization() may change initialized proxy). (Arnaud)
. Fix is_zend_ptr() huge block comparison. (nielsdos)
. Fixed potential OOB read in zend_dirname() on Windows. (cmb)
. Fixed bug GH-15964 (printf() can strip sign of -INF). (divinity76, cmb)
- Curl:
. Fix various memory leaks in curl mime handling. (nielsdos)

View file

@ -247,8 +247,9 @@ php_sprintf_appenddouble(zend_string **buffer, size_t *pos,
if (zend_isinf(number)) {
is_negative = (number<0);
php_sprintf_appendstring(buffer, pos, "INF", 3, 0, padding,
alignment, 3, is_negative, 0, always_sign);
char *str = is_negative ? "-INF" : "INF";
php_sprintf_appendstring(buffer, pos, str, strlen(str), 0, padding,
alignment, strlen(str), is_negative, 0, always_sign);
return;
}

View file

@ -44,6 +44,8 @@ try {
} catch(\ValueError $e) {
print('Error found: '.$e->getMessage()."\n");
}
printf("printf test 31:%.17g\n", INF);
printf("printf test 32:%.17g\n", -INF);
vprintf("vprintf test 1:%2\$-2d %1\$2d\n", array(1, 2));
@ -83,4 +85,6 @@ printf test 27:3 1 2
printf test 28:02 1
printf test 29:2 1
printf test 30:Error found: Argument number specifier must be greater than zero and less than 2147483647
printf test 31:INF
printf test 32:-INF
vprintf test 1:2 1