From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 5 Feb 2021 12:12:30 +0000 (+0100)
Subject: Merge branch 'PHP-8.0'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b08b422a7f03652383bf3ef9d1324b9038b4f2d;p=php

Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix #74779: x() and y() truncating floats to integers
---

3b08b422a7f03652383bf3ef9d1324b9038b4f2d
diff --cc ext/mysqlnd/mysqlnd_wireprotocol.c
index 7a66d05c75,f98cb6c971..252fc0e8fc
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@@ -1653,9 -1667,11 +1653,9 @@@ php_mysqlnd_rowp_read_text_protocol(MYS
  				zend_uchar save = *(p + len);
  				/* We have to make it ASCIIZ temporarily */
  				*(p + len) = '\0';
- 				ZVAL_DOUBLE(current_field, atof((char *) p));
+ 				ZVAL_DOUBLE(current_field, zend_strtod((char *) p, NULL));
  				*(p + len) = save;
 -			}
 -#endif /* MYSQLND_STRING_TO_INT_CONVERSION */
 -			else {
 +			} else {
  				ZVAL_STRINGL_FAST(current_field, (char *)p, len);
  			}
  			p += len;