From: Julien Pauli <jpauli@php.net>
Date: Mon, 19 Sep 2016 14:06:12 +0000 (+0200)
Subject: Do not wrap user exception in case of custom JSON serialization
X-Git-Tag: php-7.0.12RC1~42^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ed4b13fb62eafc53fca06c1929613c334b51edb;p=php

Do not wrap user exception in case of custom JSON serialization
---

diff --git a/ext/json/json.c b/ext/json/json.c
index 8c4d20fb2a..1e37e50ccb 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -589,7 +589,9 @@ static void json_encode_serializable_object(smart_str *buf, zval *val, int optio
 	ZVAL_STRING(&fname, "jsonSerialize", 0);
 
 	if (FAILURE == call_user_function_ex(EG(function_table), &val, &fname, &retval, 0, NULL, 1, NULL TSRMLS_CC) || !retval) {
-		zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Failed calling %s::jsonSerialize()", ce->name);
+		if (!EG(exception)) {
+			zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Failed calling %s::jsonSerialize()", ce->name);
+		}
 		smart_str_appendl(buf, "null", sizeof("null") - 1);
 		return;
     }
diff --git a/ext/json/tests/bug73113.phpt b/ext/json/tests/bug73113.phpt
new file mode 100644
index 0000000000..b1d70bc4c7
--- /dev/null
+++ b/ext/json/tests/bug73113.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Bug #73113 (Segfault with throwing JsonSerializable)
+Also test that the custom exception is not wrapped by ext/json
+--SKIPIF--
+<?php if (!extension_loaded("json")) print "skip"; ?>
+--FILE--
+<?php
+
+class JsonSerializableObject implements \JsonSerializable
+{
+    public function jsonSerialize()
+    {
+        throw new \Exception('This error is expected');
+    }
+}
+
+$obj = new JsonSerializableObject();
+try {
+	echo json_encode($obj);
+} catch (\Exception $e) {
+	echo $e->getMessage();
+}
+--EXPECTF--
+This error is expected