From 3003cd2473fe2a12ba052d6304bd5846100fd1cc Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Thu, 20 Jul 2006 09:33:28 +0000 Subject: MFH: use E_WARNING on recursion and add null to the result to keep it valid --- ext/json/json.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ext/json/json.c') diff --git a/ext/json/json.c b/ext/json/json.c index 99e80fa913..1b7de735d9 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -136,7 +136,8 @@ static void json_encode_array(smart_str *buf, zval **val TSRMLS_DC) { } if (myht && myht->nApplyCount > 1) { - php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "recursion detected"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "recursion detected"); + smart_str_appendl(buf, "null", 4); return; } -- cgit v1.2.1