iliaa Wed Sep 10 23:19:50 2008 UTC Modified files: /php-src/ext/mbstring mbstring.c Log: MFB: Fixed bug #46042 (memory leaks with reflection of mb_convert_encoding()) http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.297&r2=1.298&diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.297 php-src/ext/mbstring/mbstring.c:1.298 --- php-src/ext/mbstring/mbstring.c:1.297 Mon Aug 18 00:36:03 2008 +++ php-src/ext/mbstring/mbstring.c Wed Sep 10 23:19:50 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.297 2008/08/18 00:36:03 felipe Exp $ */ +/* $Id: mbstring.c,v 1.298 2008/09/10 23:19:50 iliaa Exp $ */ /* * PHP 4 Multibyte String module "mbstring" @@ -2961,7 +2961,7 @@ s_free = _from_encodings; break; default: - convert_to_string_ex(&arg_old); + convert_to_string(arg_old); _from_encodings = Z_STRVAL_P(arg_old); break; } @@ -3082,7 +3082,7 @@ } break; default: - convert_to_string_ex(&encoding_list); + convert_to_string(encoding_list); if (!php_mb_parse_encoding_list(Z_STRVAL_P(encoding_list), Z_STRLEN_P(encoding_list), &list, &size, 0 TSRMLS_CC)) { if (list) { efree(list);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php