diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-15 09:11:19 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-15 09:11:44 +0200 |
| commit | 844a1245ef4ec9b57fb1ca10ed87689cfb652dd4 (patch) | |
| tree | fedbba108f2d6bfcbb7eb9ad77984933fd728acc | |
| parent | f4c9f8b17bdcb4b32455295cdfbddc216c7fb0a2 (diff) | |
| parent | d1cd489a53c697898c2da5101c775bd6259f4be0 (diff) | |
| download | php-git-844a1245ef4ec9b57fb1ca10ed87689cfb652dd4.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79596: MySQL FLOAT truncates to int some locales
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/mysqlnd/mysql_float_to_double.h | 4 | ||||
| -rw-r--r-- | ext/pdo_mysql/tests/bug79596.phpt | 30 |
3 files changed, 35 insertions, 2 deletions
@@ -11,6 +11,9 @@ PHP NEWS - FFI: . Fixed bug #79571 (FFI: var_dumping unions may segfault). (cmb) +- MySQLnd: + . Fixed bug #79596 (MySQL FLOAT truncates to int some locales). (cmb) + - Opcache: . Fixed bug #79588 (Boolean opcache settings ignore on/off values). (cmb) diff --git a/ext/mysqlnd/mysql_float_to_double.h b/ext/mysqlnd/mysql_float_to_double.h index 0690a4c498..f9048d827c 100644 --- a/ext/mysqlnd/mysql_float_to_double.h +++ b/ext/mysqlnd/mysql_float_to_double.h @@ -31,7 +31,7 @@ /* * Convert from a 4-byte float to a 8-byte decimal by first converting - * the float to a string, and then the string to a double. + * the float to a string (ignoring localization), and then the string to a double. * The decimals argument specifies the precision of the output. If decimals * is less than zero, then a gcvt(3) like logic is used with the significant * digits set to FLT_DIG i.e. 6. @@ -42,7 +42,7 @@ static inline double mysql_float_to_double(float fp4, int decimals) { if (decimals < 0) { php_gcvt(fp4, FLT_DIG, '.', 'e', num_buf); } else { - sprintf(num_buf, "%.*f", decimals, fp4); + snprintf(num_buf, MAX_CHAR_BUF_LEN, "%.*F", decimals, fp4); } return zend_strtod(num_buf, NULL); diff --git a/ext/pdo_mysql/tests/bug79596.phpt b/ext/pdo_mysql/tests/bug79596.phpt new file mode 100644 index 0000000000..054e3c1c2e --- /dev/null +++ b/ext/pdo_mysql/tests/bug79596.phpt @@ -0,0 +1,30 @@ +--TEST-- +Bug #79596 (MySQL FLOAT truncates to int some locales) +--SKIPIF-- +<?php +require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc'); +require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc'); +MySQLPDOTest::skip(); +if (!setlocale(LC_ALL, 'de_DE', 'de-DE')) die('skip German locale not available'); +?> +--FILE-- +<?php +require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc'); + +setlocale(LC_ALL, 'de_DE', 'de-DE'); + +$pdo = MySQLPDOTest::factory(); +$pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false); +$pdo->query('CREATE TABLE bug79596 (broken FLOAT(2,1))'); +$pdo->query('INSERT INTO bug79596 VALUES(4.9)'); +var_dump($pdo->query('SELECT broken FROM bug79596')->fetchColumn(0)); +?> +--CLEAN-- +<?php +require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc'); + +$pdo = MySQLPDOTest::factory(); +$pdo->exec("DROP TABLE IF EXISTS bug79596"); +?> +--EXPECT-- +float(4,9) |