diff options
| author | Julien Pauli <jpauli@php.net> | 2016-09-19 16:08:37 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2016-09-19 16:11:17 +0200 |
| commit | c4f3ea10e49a2a44e767ce38c57329934a6bbaba (patch) | |
| tree | 168fe7732a5b216389c16e5c9e1e0e6587c1eb47 /ext/json | |
| parent | 01759c43463c30b57c15e32c5f4b454fba81f039 (diff) | |
| parent | 1ed4b13fb62eafc53fca06c1929613c334b51edb (diff) | |
| download | php-git-c4f3ea10e49a2a44e767ce38c57329934a6bbaba.tar.gz | |
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
Diffstat (limited to 'ext/json')
| -rw-r--r-- | ext/json/json_encoder.c | 4 | ||||
| -rw-r--r-- | ext/json/tests/bug73113.phpt | 24 |
2 files changed, 27 insertions, 1 deletions
diff --git a/ext/json/json_encoder.c b/ext/json/json_encoder.c index ae9e086fc0..8da2761e99 100644 --- a/ext/json/json_encoder.c +++ b/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; 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 |