summaryrefslogtreecommitdiff
path: root/ext/json/json.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2016-04-22 21:41:44 -0700
committerXinchen Hui <laruence@gmail.com>2016-04-22 21:41:44 -0700
commit589d0e0f187ff82f90110057f624c958f0d3ec86 (patch)
treeb12313d443ae59eb85827f8f05975e16c7a53ea7 /ext/json/json.c
parent9eb7c8cd3b202ff77f1442f5a5d3107bd7fc3a18 (diff)
downloadphp-git-589d0e0f187ff82f90110057f624c958f0d3ec86.tar.gz
Fixed bug #72069 (Behavior \JsonSerializable different from json_encode)
Diffstat (limited to 'ext/json/json.c')
-rw-r--r--ext/json/json.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/json/json.c b/ext/json/json.c
index 81258cb734..6571bf99f0 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -253,7 +253,7 @@ static PHP_FUNCTION(json_decode)
return;
}
- JSON_G(error_code) = 0;
+ JSON_G(error_code) = PHP_JSON_ERROR_NONE;
if (!str_len) {
JSON_G(error_code) = PHP_JSON_ERROR_SYNTAX;