Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #74779: x() and y() truncating floats to integers
This commit is contained in:
Christoph M. Becker 2021-02-05 13:11:22 +01:00
commit 4be5b4aa25
3 changed files with 46 additions and 1 deletions

View file

@ -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 */