php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0'

Browse Source 
* PHP-8.0:
  Revert "Fix #79908: json_encode encodes negative zero as int"
This commit is contained in:
Christoph M. Becker
2021-07-20 00:30:37 +02:00
parent 0ce1cd1370 18abfcb306
commit d2cc7239b7
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ext/json/json_encoder.c
View File

@@ -84,8 +84,7 @@ static inline void php_json_encode_double(smart_str *buf, double d, int options)
php_gcvt(d, (int)PG(serialize_precision), '.', 'e', num);
len = strlen(num);
if ((options & PHP_JSON_PRESERVE_ZERO_FRACTION && strchr(num, '.') == NULL && len < PHP_DOUBLE_MAX_LENGTH - 2)
|| (UNEXPECTED(len == 2 && num[0] == '-' && num[1] == '0'))) {
if (options & PHP_JSON_PRESERVE_ZERO_FRACTION && strchr(num, '.') == NULL && len < PHP_DOUBLE_MAX_LENGTH - 2) {
num[len++] = '.';
num[len++] = '0';
num[len] = '\0';

12
ext/json/tests/bug79908.phpt
View File

@@ -1,12 +0,0 @@
--TEST--
Bug #79908 (json_encode encodes negative zero as int)
--SKIPIF--
<?php
if (!extension_loaded('json')) die("skip json extension not available");
?>
--FILE--
<?php
var_dump(json_encode(-0.));
?>
--EXPECT--
string(4) "-0.0"