com php-src: Fix ::jsonSerialize() failure message: ext/json/json.c
| From: | Nikita Popov | Date: | Sun, 12 Oct 2014 18:55:51 +0000 |
| Subject: | com php-src: Fix ::jsonSerialize() failure message: ext/json/json.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82256@lists.php.net to get a copy of this message | ||
Commit: 016a96c7c27fb244bd774a7fcd95edd30938a240
Author: Nikita Popov <nikic@php.net> Sun, 12 Oct 2014 20:11:57 +0200
Parents: c4ab08ac9d7a407f4b2ab43790cd0eae738615c6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=016a96c7c27fb244bd774a7fcd95edd30938a240
Log:
Fix ::jsonSerialize() failure message
Changed paths:
M ext/json/json.c
Diff:
diff --git a/ext/json/json.c b/ext/json/json.c
index 16e452a..8f4f281 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;