archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Do not wrap user exception in case of custom JSON serialization

Browse source
This commit is contained in:
Julien Pauli 2016-09-19 16:06:12 +02:00
parent 6682673070
commit 1ed4b13fb6
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/json/json.c
View file

@ -589,7 +589,9 @@ static void json_encode_serializable_object(smart_str *buf, zval *val, int optio
ZVAL_STRING(&fname, "jsonSerialize", 0); ZVAL_STRING(&fname, "jsonSerialize", 0);
if (FAILURE == call_user_function_ex(EG(function_table), &val, &fname, &retval, 0, NULL, 1, NULL TSRMLS_CC) || !retval) { 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); smart_str_appendl(buf, "null", sizeof("null") - 1);
return; return;
} }

24
ext/json/tests/bug73113.phpt Normal file
View file

@ -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