From d1cd489a53c697898c2da5101c775bd6259f4be0 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Fri, 15 May 2020 09:09:41 +0200
Subject: Fix #79596: MySQL FLOAT truncates to int some locales

We must not do locale aware float to string conversion here; instead
we using our `snprintf()` implementation with the `F` specifier.
---
 NEWS                                |  3 +++
 ext/mysqlnd/mysql_float_to_double.h |  4 ++--
 ext/pdo_mysql/tests/bug79596.phpt   | 30 ++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 ext/pdo_mysql/tests/bug79596.phpt

diff --git a/NEWS b/NEWS
index d1f6f33f5b..dbb6da2c7f 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@ PHP                                                                        NEWS
   . Fixed bug #79566 (Private SHM is not private on Windows). (cmb)
   . Fixed bug #79489 (.user.ini does not inherit). (cmb)
 
+- MySQLnd:
+  . Fixed bug #79596 (MySQL FLOAT truncates to int some locales). (cmb)
+
 - Opcache:
   . Fixed bug #79535 (PHP crashes with specific opcache.optimization_level).
     (Nikita)
diff --git a/ext/mysqlnd/mysql_float_to_double.h b/ext/mysqlnd/mysql_float_to_double.h
index 7ac77d9127..744d56a5f3 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 {
-		php_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)
-- 
cgit v1.2.1