diff --git a/NEWS b/NEWS index cbcc6d8839f..3cb8d111747 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,9 @@ PHP NEWS . Fixed bug #53251 (bindtextdomain with null dir doesn't return old value). (cmb) +- MySQLi: + . Fixed bug #74779 (x() and y() truncating floats to integers). (cmb) + - Opcache: . Fixed bug #80634 (write_property handler of internal classes is skipped on preloaded JITted code). (Dmitry) diff --git a/ext/mysqli/tests/bug74779.phpt b/ext/mysqli/tests/bug74779.phpt new file mode 100644 index 00000000000..88e658ef611 --- /dev/null +++ b/ext/mysqli/tests/bug74779.phpt @@ -0,0 +1,42 @@ +--TEST-- +Bug #74779 (x() and y() truncating floats to integers) +--SKIPIF-- + +--FILE-- +options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, true)) { + printf("[003] [%d] %s\n", $link->errno, $link->error); +} + +if (!$result = $link->query("SELECT Y(Point(56.7, 53.34))")) { + printf("[004] [%d] %s\n", $link->errno, $link->error); +} + +if (!$array = $result->fetch_array(MYSQLI_ASSOC)) { + printf("[005] [%d] %s\n", $link->errno, $link->error); +} + +var_dump($array); + +mysqli_close($link); +?> +--EXPECT-- +array(1) { + ["Y(Point(56.7, 53.34))"]=> + float(53,34) +} diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 1fc2941e663..f98cb6c9711 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -1667,7 +1667,7 @@ php_mysqlnd_rowp_read_text_protocol_aux(MYSQLND_ROW_BUFFER * row_buffer, zval * 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 */