archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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
commit d2cc7239b7
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
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); php_gcvt(d, (int)PG(serialize_precision), '.', 'e', num);
len = strlen(num); len = strlen(num);
if ((options & PHP_JSON_PRESERVE_ZERO_FRACTION && strchr(num, '.') == NULL && len < PHP_DOUBLE_MAX_LENGTH - 2) if (options & PHP_JSON_PRESERVE_ZERO_FRACTION && strchr(num, '.') == NULL && len < PHP_DOUBLE_MAX_LENGTH - 2) {
|| (UNEXPECTED(len == 2 && num[0] == '-' && num[1] == '0'))) {
num[len++] = '.'; num[len++] = '.';
num[len++] = '0'; num[len++] = '0';
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"