diff options
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |