archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  Fix GH-17503: Undefined float conversion in mb_convert_variables
This commit is contained in:
Christoph M. Becker 2025-02-04 15:55:06 +01:00
commit 61f42f2d4e
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ext/mbstring/mbstring.c
View file

@ -3348,7 +3348,8 @@ try_next_encoding:;
} }
for (size_t i = 0; i < length; i++) { for (size_t i = 0; i < length; i++) {
array[i].demerits = (uint64_t) (array[i].demerits * array[i].multiplier); double demerits = array[i].demerits * (double) array[i].multiplier;
array[i].demerits = demerits < (double) UINT64_MAX ? (uint64_t) demerits : UINT64_MAX;
} }
return length; return length;

11
ext/mbstring/tests/gh17503.phpt Normal file
View file

@ -0,0 +1,11 @@
--TEST--
GH-17503 (Undefined float conversion in mb_convert_variables)
--EXTENSIONS--
mbstring
--FILE--
<?php
$a = array_fill(0, 500, "<blah>");
var_dump(mb_convert_variables("ASCII", ["UTF-8", "UTF-16"], $a));
?>
--EXPECT--
string(5) "UTF-8"