summaryrefslogtreecommitdiff
path: root/ext/json/json.c
diff options
context:
space:
mode:
authorJakub Zelenka <bukka@php.net>2016-08-29 15:01:00 +0100
committerJakub Zelenka <bukka@php.net>2016-08-29 15:01:00 +0100
commitab65665a0ec5a3c5da8a9ad8c7f209b5038ce14a (patch)
treee5f277594d91668713c04ae4697edcde23bff296 /ext/json/json.c
parent50c5d13d26b5cd471c7be5db81cf5d57ff957437 (diff)
parentf5b4aae7acad9ad86bd00c0209af28b273e5d82e (diff)
downloadphp-git-ab65665a0ec5a3c5da8a9ad8c7f209b5038ce14a.tar.gz
Merge branch 'json_encode_fail_return' into PHP-7.1
Diffstat (limited to 'ext/json/json.c')
-rw-r--r--ext/json/json.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/json/json.c b/ext/json/json.c
index 2acfb5e79f..3bbe532d97 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -186,9 +186,7 @@ static PHP_MINFO_FUNCTION(json)
PHP_JSON_API int php_json_encode(smart_str *buf, zval *val, int options) /* {{{ */
{
- php_json_encode_zval(buf, val, options);
-
- return JSON_G(error_code) > 0 ? FAILURE : SUCCESS;
+ return php_json_encode_zval(buf, val, options);
}
/* }}} */