From: Dmitry Stogov Date: Wed, 7 Oct 2015 01:26:26 +0000 (+0300) Subject: Restored the original (php-5) behavior of convert_to_cstring(). It was broken in... X-Git-Tag: php-7.1.0alpha1~1018^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8b335c492f87178ab18ca34f928051bc1b65934;p=php Restored the original (php-5) behavior of convert_to_cstring(). It was broken in php7 by mistake and caused problems in ext/pgsql/tests/bug46408.phpt. --- diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 2345e0b2d4..f2378d84b6 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -492,7 +492,16 @@ try_again: ZEND_API void ZEND_FASTCALL _convert_to_cstring(zval *op ZEND_FILE_LINE_DC) /* {{{ */ { - _convert_to_string(op ZEND_FILE_LINE_CC); + double dval; + if (Z_TYPE_P(op) == IS_DOUBLE) { + zend_string *str; + double dval = Z_DVAL_P(op); + + str = zend_strpprintf(0, "%.*H", (int) EG(precision), dval); + ZVAL_NEW_STR(op, str); + } else { + _convert_to_string(op ZEND_FILE_LINE_CC); + } } /* }}} */