JSON throw exception when throw_on_error declare is enabled

Author: Girgias

ext/json/json.c

@@ -201,7 +201,8 @@ PHP_JSON_API int php_json_decode_ex(zval *return_value, const char *str, size_t
 
 	if (php_json_yyparse(&parser)) {
 		php_json_error_code error_code = php_json_parser_error_code(&parser);
-		if (!(options & PHP_JSON_THROW_ON_ERROR)) {
+		if (!(options & PHP_JSON_THROW_ON_ERROR) &&
+				(EG(current_execute_data)->prev_execute_data->func->common.fn_flags & ZEND_ACC_THROW_WARNING) == 0) {
 			JSON_G(error_code) = error_code;
 		} else {
 			zend_throw_exception(php_json_exception_ce, php_json_get_error_msg(error_code), error_code);
@@ -234,7 +235,9 @@ PHP_FUNCTION(json_encode)
 	encoder.max_depth = (int)depth;
 	php_json_encode_zval(&buf, parameter, (int)options, &encoder);
 
-	if (!(options & PHP_JSON_THROW_ON_ERROR) || (options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR)) {
+	if ((!(options & PHP_JSON_THROW_ON_ERROR) &&
+			(EX(prev_execute_data)->func->common.fn_flags & ZEND_ACC_THROW_WARNING) == 0)
+			|| (options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR)) {
 		JSON_G(error_code) = encoder.error_code;
 		if (encoder.error_code != PHP_JSON_ERROR_NONE && !(options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR)) {
 			smart_str_free(&buf);
@@ -274,17 +277,19 @@ PHP_FUNCTION(json_decode)
 		Z_PARAM_LONG(options)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (!(options & PHP_JSON_THROW_ON_ERROR)) {
+	if (!(options & PHP_JSON_THROW_ON_ERROR) &&
+			(EX(prev_execute_data)->func->common.fn_flags & ZEND_ACC_THROW_WARNING) == 0) {
 		JSON_G(error_code) = PHP_JSON_ERROR_NONE;
 	}
 
 	if (!str_len) {
-		if (!(options & PHP_JSON_THROW_ON_ERROR)) {
+		if (!(options & PHP_JSON_THROW_ON_ERROR) &&
+			(EX(prev_execute_data)->func->common.fn_flags & ZEND_ACC_THROW_WARNING) == 0) {
 			JSON_G(error_code) = PHP_JSON_ERROR_SYNTAX;
-		} else {
-			zend_throw_exception(php_json_exception_ce, php_json_get_error_msg(PHP_JSON_ERROR_SYNTAX), PHP_JSON_ERROR_SYNTAX);
+			RETURN_NULL();
 		}
-		RETURN_NULL();
+		zend_throw_exception(php_json_exception_ce, php_json_get_error_msg(PHP_JSON_ERROR_SYNTAX), PHP_JSON_ERROR_SYNTAX);
+		RETURN_THROWS();
 	}
 
 	if (depth <= 0) {

ext/json/tests/json_decode_with_throw_on_error_declare.phpt

@@ -0,0 +1,49 @@
+--TEST--
+Test json_decode() function when throw_on_error declare is present
+--FILE--
+<?php
+declare(throw_on_error=1);
+
+try {
+    var_dump(json_decode("{", false, 512));
+} catch (JsonException $e) {
+    var_dump($e);
+}
+
+?>
+--EXPECTF--
+object(JsonException)#1 (7) {
+  ["message":protected]=>
+  string(12) "Syntax error"
+  ["string":"Exception":private]=>
+  string(0) ""
+  ["code":protected]=>
+  int(4)
+  ["file":protected]=>
+  string(%d) "%s"
+  ["line":protected]=>
+  int(%d)
+  ["trace":"Exception":private]=>
+  array(1) {
+    [0]=>
+    array(4) {
+      ["file"]=>
+      string(%d) "%s"
+      ["line"]=>
+      int(%d)
+      ["function"]=>
+      string(11) "json_decode"
+      ["args"]=>
+      array(3) {
+        [0]=>
+        string(1) "{"
+        [1]=>
+        bool(false)
+        [2]=>
+        int(512)
+      }
+    }
+  }
+  ["previous":"Exception":private]=>
+  NULL
+}

ext/json/tests/json_encode_with_throw_on_error_declare.phpt

@@ -0,0 +1,53 @@
+--TEST--
+Test json_encode() function when throw_on_error declare is present
+--FILE--
+<?php
+declare(throw_on_error=1);
+
+try {
+    var_dump(json_encode("\x80"));
+} catch (JsonException $e) {
+    var_dump($e);
+}
+
+// JSON_PARTIAL_OUTPUT_ON_ERROR is incompatible with exceptions
+var_dump(json_encode("\x80",JSON_PARTIAL_OUTPUT_ON_ERROR));
+var_dump(json_last_error());
+var_dump(json_last_error_msg());
+
+?>
+--EXPECTF--
+object(JsonException)#1 (7) {
+  ["message":protected]=>
+  string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
+  ["string":"Exception":private]=>
+  string(0) ""
+  ["code":protected]=>
+  int(5)
+  ["file":protected]=>
+  string(%d) "%s"
+  ["line":protected]=>
+  int(%d)
+  ["trace":"Exception":private]=>
+  array(1) {
+    [0]=>
+    array(4) {
+      ["file"]=>
+      string(%d) "%s"
+      ["line"]=>
+      int(%d)
+      ["function"]=>
+      string(11) "json_encode"
+      ["args"]=>
+      array(1) {
+        [0]=>
+        string(1) "%s"
+      }
+    }
+  }
+  ["previous":"Exception":private]=>
+  NULL
+}
+string(4) "null"
+int(5)
+string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"