diff options
| author | Julien Pauli <jpauli@php.net> | 2016-09-19 16:12:33 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2016-09-19 16:42:53 +0200 |
| commit | 7c7dc62c11da6e1e10452f96c1c8b823e5bb468c (patch) | |
| tree | 807be2631dfc68385c274c327e3daccf44ff22c9 /ext/json | |
| parent | d8d409135777091302d7c8f905f3f093d95c7b0b (diff) | |
| parent | c4f3ea10e49a2a44e767ce38c57329934a6bbaba (diff) | |
| download | php-git-7c7dc62c11da6e1e10452f96c1c8b823e5bb468c.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Do not wrap user exception in case of custom JSON serialization
Conflicts:
ext/json/json_encoder.c
Diffstat (limited to 'ext/json')
| -rw-r--r-- | ext/json/json_encoder.c | 4 | ||||
| -rw-r--r-- | ext/json/tests/bug68992.phpt | 1 | ||||
| -rw-r--r-- | ext/json/tests/bug73113.phpt | 24 |
3 files changed, 27 insertions, 2 deletions
diff --git a/ext/json/json_encoder.c b/ext/json/json_encoder.c index 8fd2f23dff..f94674831a 100644 --- a/ext/json/json_encoder.c +++ b/ext/json/json_encoder.c @@ -487,7 +487,9 @@ static int php_json_encode_serializable_object(smart_str *buf, zval *val, int op 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)); + } zval_ptr_dtor(&fname); if (options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR) { diff --git a/ext/json/tests/bug68992.phpt b/ext/json/tests/bug68992.phpt index 0fc41eca49..06448bbb38 100644 --- a/ext/json/tests/bug68992.phpt +++ b/ext/json/tests/bug68992.phpt @@ -26,5 +26,4 @@ try { } ?> --EXPECT-- -Failed calling MyClass::jsonSerialize() (0) [Exception] Not implemented! (0) [Exception] 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 |