Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Do not wrap user exception in case of custom JSON serialization

Conflicts:
	ext/json/json.c

ext/json/json_encoder.c

@@ -467,7 +467,9 @@ static void php_json_encode_serializable_object(smart_str *buf, zval *val, int o
 
 	origin_error_code = JSON_G(error_code);
 	if (FAILURE == call_user_function_ex(EG(function_table), val, &fname, &retval, 0, NULL, 1, NULL) || Z_TYPE(retval) == IS_UNDEF) {
-		zend_throw_exception_ex(NULL, 0, "Failed calling %s::jsonSerialize()", ZSTR_VAL(ce->name));
+		if (!EG(exception)) {
+			zend_throw_exception_ex(NULL, 0, "Failed calling %s::jsonSerialize()", ZSTR_VAL(ce->name));
+		}
 		smart_str_appendl(buf, "null", sizeof("null") - 1);
 		zval_ptr_dtor(&fname);
 		return;

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