diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-07-20 09:33:28 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-07-20 09:33:28 +0000 |
| commit | 3003cd2473fe2a12ba052d6304bd5846100fd1cc (patch) | |
| tree | c57dabf613c729f4d018046320dcb654638278b0 /ext/json/json.c | |
| parent | 60720d285f6c0ec42bb15946f9eb5f5516e46b7f (diff) | |
| download | php-git-3003cd2473fe2a12ba052d6304bd5846100fd1cc.tar.gz | |
MFH: use E_WARNING on recursion and add null to the result to keep it valid
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |