diff options
| author | Anatol Belski <ab@php.net> | 2014-10-13 13:52:31 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-13 13:52:31 +0200 |
| commit | 19c41e1f538e854fa8450715791c44f55e909588 (patch) | |
| tree | ff89ca91ab2e7d0add6d6e8d056536547c281498 /ext/json/json.c | |
| parent | e1cd0e0a38deb91d24ded68df010b7f6c03d2cb6 (diff) | |
| parent | 702a2dfb3ef3c603d89bf7e4e9a63b6f8ff8968d (diff) | |
| download | php-git-19c41e1f538e854fa8450715791c44f55e909588.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
We can't eliminate FETCH_CONSTANT opcodes for constants represented by AST.
Ensure __LINE__ is always accurate
Fix incdec of referenced properties
Fix ::jsonSerialize() failure message
Fix invalid zend_string_frees in reflection
Remove retval member in spl_dllist
DLL export several APIs needed for phpdbg
More fixes for nodelist array access - testing for null property read - no zval copying if the type is already long - memory fix for master
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index 16e452a004..8f4f281ef1 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -571,7 +571,7 @@ static void json_encode_serializable_object(smart_str *buf, zval *val, int optio ZVAL_STRING(&fname, "jsonSerialize"); if (FAILURE == call_user_function_ex(EG(function_table), val, &fname, &retval, 0, NULL, 1, NULL TSRMLS_CC) || Z_TYPE(retval) == IS_UNDEF) { - zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Failed calling %s::jsonSerialize()", ce->name); + zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Failed calling %s::jsonSerialize()", ce->name->val); smart_str_appendl(buf, "null", sizeof("null") - 1); zval_ptr_dtor(&fname); return; |