Do conversion locale-independently in a few other places

kocsismate · kocsismate · commit 655ad9c8f5ec · 2020-05-07T22:55:26.000+02:00
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
@@ -512,7 +512,7 @@ static void _build_trace_args(zval *arg, smart_str *str) /* {{{ */
 			smart_str_appends(str, ", ");
 			break;
 		case IS_DOUBLE: {
-			smart_str_append_printf(str, "%.*G", (int) EG(precision), Z_DVAL_P(arg));
+			smart_str_append_printf(str, "%.*H", (int) EG(precision), Z_DVAL_P(arg));
 			smart_str_appends(str, ", ");
 			break;
 		}
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
@@ -605,12 +605,6 @@ ZEND_API void ZEND_FASTCALL convert_to_boolean(zval *op) /* {{{ */
 }
 /* }}} */
 
-ZEND_API void ZEND_FASTCALL _convert_to_cstring(zval *op) /* {{{ */
-{
-	_convert_to_string(op);
-}
-/* }}} */
-
 ZEND_API void ZEND_FASTCALL _convert_to_string(zval *op) /* {{{ */
 {
 try_again:
@@ -945,9 +939,7 @@ static zend_always_inline zend_string* __zval_get_string_func(zval *op, zend_boo
 			return zend_long_to_str(Z_LVAL_P(op));
 		}
 		case IS_DOUBLE: {
-			zend_string *str = zend_strpprintf_unchecked(0, "%.*H", (int) EG(precision), Z_DVAL_P(op));
-
-			return str;
+			return zend_strpprintf_unchecked(0, "%.*H", (int) EG(precision), Z_DVAL_P(op));
 		}
 		case IS_ARRAY:
 			zend_error(E_WARNING, "Array to string conversion");
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
@@ -257,7 +257,6 @@ ZEND_API int ZEND_FASTCALL increment_function(zval *op1);
 ZEND_API int ZEND_FASTCALL decrement_function(zval *op2);
 
 ZEND_API void ZEND_FASTCALL convert_scalar_to_number(zval *op);
-ZEND_API void ZEND_FASTCALL _convert_to_cstring(zval *op);
 ZEND_API void ZEND_FASTCALL _convert_to_string(zval *op);
 ZEND_API void ZEND_FASTCALL convert_to_long(zval *op);
 ZEND_API void ZEND_FASTCALL convert_to_double(zval *op);
@@ -340,7 +339,6 @@ static zend_always_inline zend_bool try_convert_to_string(zval *op) {
 #define _zval_get_double_func(op) zval_get_double_func(op)
 #define _zval_get_string_func(op) zval_get_string_func(op)
 
-#define convert_to_cstring(op) if (Z_TYPE_P(op) != IS_STRING) { _convert_to_cstring((op)); }
 #define convert_to_string(op) if (Z_TYPE_P(op) != IS_STRING) { _convert_to_string((op)); }
 
 
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -1987,7 +1987,7 @@ PHP_FUNCTION(pg_query_params)
 				zval tmp_val;
 
 				ZVAL_COPY(&tmp_val, tmp);
-				convert_to_cstring(&tmp_val);
+				convert_to_string(&tmp_val);
 				if (Z_TYPE(tmp_val) != IS_STRING) {
 					php_error_docref(NULL, E_WARNING,"Error converting parameter");
 					zval_ptr_dtor(&tmp_val);
diff --git a/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c b/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c
@@ -224,7 +224,7 @@ xml_element* XMLRPC_to_xml_element_worker(XMLRPC_VALUE current_vector, XMLRPC_VA
          case xmlrpc_double:
             {
                                 elem_val->name = estrdup(ELEM_DOUBLE);
-                ap_php_snprintf(buf, BUF_SIZE, "%.*G", (int) EG(precision), XMLRPC_GetValueDouble(node));
+                ap_php_snprintf(buf, BUF_SIZE, "%.*H", (int) EG(precision), XMLRPC_GetValueDouble(node));
                 simplestring_add(&elem_val->text, buf);
             }
             break;
diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c
@@ -676,7 +676,7 @@ PHPDBG_API void phpdbg_xml_var_dump(zval *zv) {
 				phpdbg_xml("<int refstatus=\"%s\" value=\"" ZEND_LONG_FMT "\" />", COMMON, Z_LVAL_P(zv));
 				break;
 			case IS_DOUBLE:
-				phpdbg_xml("<float refstatus=\"%s\" value=\"%.*G\" />", COMMON, (int) EG(precision), Z_DVAL_P(zv));
+				phpdbg_xml("<float refstatus=\"%s\" value=\"%.*H\" />", COMMON, (int) EG(precision), Z_DVAL_P(zv));
 				break;
 			case IS_STRING:
 				phpdbg_xml("<string refstatus=\"%s\" length=\"%zd\" value=\"%.*s\" />", COMMON, Z_STRLEN_P(zv), (int) Z_STRLEN_P(zv), Z_STRVAL_P(zv));
@@ -801,7 +801,7 @@ char *phpdbg_short_zval_print(zval *zv, int maxlen) /* {{{ */
 			spprintf(&decode, 0, ZEND_LONG_FMT, Z_LVAL_P(zv));
 			break;
 		case IS_DOUBLE:
-			spprintf(&decode, 0, "%.*G", 14, Z_DVAL_P(zv));
+			spprintf(&decode, 0, "%.*H", 14, Z_DVAL_P(zv));
 
 			/* Make sure it looks like a float */
 			if (zend_finite(Z_DVAL_P(zv)) && !strchr(decode, '.')) {

Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,7 @@ static void _build_trace_args(zval arg, smart_str str) /* {{{ */`
`512`	`512`	`smart_str_appends(str, ", ");`
`513`	`513`	`break;`
`514`	`514`	`case IS_DOUBLE: {`
`515`		`- smart_str_append_printf(str, "%.*G", (int) EG(precision), Z_DVAL_P(arg));`
	`515`	`+ smart_str_append_printf(str, "%.*H", (int) EG(precision), Z_DVAL_P(arg));`
`516`	`516`	`smart_str_appends(str, ", ");`
`517`	`517`	`break;`
`518`	`518`	`}`
Original file line number	Diff line number	Diff line change
`@@ -605,12 +605,6 @@ ZEND_API void ZEND_FASTCALL convert_to_boolean(zval op) / {{{ */`
`605`	`605`	`}`
`606`	`606`	`/* }}} */`
`607`	`607`
`608`		`-ZEND_API void ZEND_FASTCALL _convert_to_cstring(zval op) / {{{ */`
`609`		`-{`
`610`		`- _convert_to_string(op);`
`611`		`-}`
`612`		`-/* }}} */`
`613`		`-`
`614`	`608`	`ZEND_API void ZEND_FASTCALL _convert_to_string(zval op) / {{{ */`
`615`	`609`	`{`
`616`	`610`	`try_again:`
`@@ -945,9 +939,7 @@ static zend_always_inline zend_string* __zval_get_string_func(zval *op, zend_boo`
`945`	`939`	`return zend_long_to_str(Z_LVAL_P(op));`
`946`	`940`	`}`
`947`	`941`	`case IS_DOUBLE: {`
`948`		`- zend_string str = zend_strpprintf_unchecked(0, "%.H", (int) EG(precision), Z_DVAL_P(op));`
`949`		`-`
`950`		`- return str;`
	`942`	`+ return zend_strpprintf_unchecked(0, "%.*H", (int) EG(precision), Z_DVAL_P(op));`
`951`	`943`	`}`
`952`	`944`	`case IS_ARRAY:`
`953`	`945`	`zend_error(E_WARNING, "Array to string conversion");`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ xml_element* XMLRPC_to_xml_element_worker(XMLRPC_VALUE current_vector, XMLRPC_VA`
`224`	`224`	`case xmlrpc_double:`
`225`	`225`	`{`
`226`	`226`	`elem_val->name = estrdup(ELEM_DOUBLE);`
`227`		`- ap_php_snprintf(buf, BUF_SIZE, "%.*G", (int) EG(precision), XMLRPC_GetValueDouble(node));`
	`227`	`+ ap_php_snprintf(buf, BUF_SIZE, "%.*H", (int) EG(precision), XMLRPC_GetValueDouble(node));`
`228`	`228`	`simplestring_add(&elem_val->text, buf);`
`229`	`229`	`}`
`230`	`230`	`break;`