mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-18 22:41:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.3' into PHP-7.4

Browse Source 
* PHP-7.3:
  Fix #79212: NumberFormatter::format() may detect wrong type
This commit is contained in:
Christoph M. Becker 2020-02-03 12:29:28 +01:00
commit 57b9eca83d
3 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -24,6 +24,9 @@ PHP NEWS
. Fixed bug #79112 (IMAP extension can't find OpenSSL libraries at configure . Fixed bug #79112 (IMAP extension can't find OpenSSL libraries at configure
time). (Nikita) time). (Nikita)
-Intl:
. Fixed bug #79212 (NumberFormatter::format() may detect wrong type). (cmb)
- MBString: - MBString:
. Fixed bug #79149 (SEGV in mb_convert_encoding with non-string encodings). . Fixed bug #79149 (SEGV in mb_convert_encoding with non-string encodings).
(cmb) (cmb)

30
ext/intl/formatter/formatter_format.c
View File

@ -53,23 +53,23 @@ PHP_FUNCTION( numfmt_format )
/* Fetch the object. */ /* Fetch the object. */
FORMATTER_METHOD_FETCH_OBJECT; FORMATTER_METHOD_FETCH_OBJECT;
if(type == FORMAT_TYPE_DEFAULT) { if(Z_TYPE_P(number) != IS_ARRAY) {
if(Z_TYPE_P(number) == IS_STRING) { convert_scalar_to_number_ex(number);
convert_scalar_to_number_ex(number); } else {
} convert_to_long(number);
if(Z_TYPE_P(number) == IS_LONG) {
/* take INT32 on 32-bit, int64 on 64-bit */
type = (sizeof(zend_long) == 8)?FORMAT_TYPE_INT64:FORMAT_TYPE_INT32;
} else if(Z_TYPE_P(number) == IS_DOUBLE) {
type = FORMAT_TYPE_DOUBLE;
} else {
type = FORMAT_TYPE_INT32;
}
} }
if(Z_TYPE_P(number) != IS_DOUBLE && Z_TYPE_P(number) != IS_LONG) { if(type == FORMAT_TYPE_DEFAULT) {
convert_scalar_to_number(number ); switch(Z_TYPE_P(number)) {
case IS_LONG:
/* take INT32 on 32-bit, int64 on 64-bit */
type = (sizeof(zend_long) == 8)?FORMAT_TYPE_INT64:FORMAT_TYPE_INT32;
break;
case IS_DOUBLE:
type = FORMAT_TYPE_DOUBLE;
break;
EMPTY_SWITCH_DEFAULT_CASE();
}
} }
switch(type) { switch(type) {

18
ext/intl/tests/bug79212.phpt Normal file
View File

@ -0,0 +1,18 @@
--TEST--
Bug #79212 (NumberFormatter::format() may detect wrong type)
--SKIPIF--
<?php
if (!extension_loaded('intl')) die('skip intl extension not available');
if (!extension_loaded('gmp')) die('skip gmp extension not available');
?>
--FILE--
<?php
$fmt = new NumberFormatter('en_US', NumberFormatter::PATTERN_DECIMAL);
var_dump($fmt->format(gmp_init('823749273428379492374')));
$fmt = new NumberFormatter('en_US', NumberFormatter::PATTERN_DECIMAL);
var_dump($fmt->format([1], NumberFormatter::TYPE_INT64));
?>
--EXPECT--
string(21) "823749273428379400000"
string(1) "1"