cvs: php-src(PHP_5_2) /ext/standard html.c

tony2001 Thu Dec 21 01:14:30 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard html.c Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.3&r2=1.111.2.2.2.4&diff_format=u Index: php-src/ext/standard/html.c diff -u php-src/ext/standard/html.c:1.111.2.2.2.3 php-src/ext/standard/html.c:1.111.2.2.2.4 --- php-src/ext/standard/html.c:1.111.2.2.2.3 Wed Nov 1 01:55:11 2006 +++ php-src/ext/standard/html.c Thu Dec 21 01:14:30 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: html.c,v 1.111.2.2.2.3 2006/11/01 01:55:11 iliaa Exp $ */ +/* $Id: html.c,v 1.111.2.2.2.4 2006/12/21 01:14:30 tony2001 Exp $ */ /* * HTML entity resources: @@ -948,7 +948,8 @@ default: php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot yet handle MBCS!"); - return 0; + efree(ret); + return NULL; } if (php_memnstr(ret, entity, entity_length, ret+retlen)) { @@ -1308,7 +1309,10 @@ } replaced = php_unescape_html_entities(str, str_len, &len, 1, quote_style, hint_charset TSRMLS_CC); - RETVAL_STRINGL(replaced, len, 0); + if (replaced) { + RETURN_STRINGL(replaced, len, 0); + } + RETURN_FALSE; } /* }}} */