diff options
| author | Xinchen Hui <laruence@gmail.com> | 2020-05-15 15:36:51 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2020-05-15 15:36:51 +0800 |
| commit | 446d189aa00dcca5eb66a78a26bb92cf8d919343 (patch) | |
| tree | 0f6c47cde758609e3df3276027e2be33bf56cee9 /ext/mysqlnd/mysql_float_to_double.h | |
| parent | ccd41e083359cf6dd264f88806dce4cc49d9358e (diff) | |
| parent | 8c6d006b55bf5ba230dda672344dbd0e2a7d4be3 (diff) | |
| download | php-git-446d189aa00dcca5eb66a78a26bb92cf8d919343.tar.gz | |
Merge branch 'PHP-7.4' of git.php.net:/php-src into PHP-7.4
* 'PHP-7.4' of git.php.net:/php-src:
Fix #79557: extension_dir = ./ext now use current directory for base
Fix #79596: MySQL FLOAT truncates to int some locales
[ci skip] Fix NEWS
Diffstat (limited to 'ext/mysqlnd/mysql_float_to_double.h')
| -rw-r--r-- | ext/mysqlnd/mysql_float_to_double.h | 4 |
1 files changed, 2 insertions, 2 deletions
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); |