iliaa Wed Sep 10 23:19:38 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring mbstring.c
Log:
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.224.2.22.2.25.2.31&r2=1.224.2.22.2.25.2.32&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.31
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.32
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.31 Mon Aug 18
00:37:16 2008
+++ php-src/ext/mbstring/mbstring.c Wed Sep 10 23:19:38 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.31 2008/08/18 00:37:16 felipe Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.32 2008/09/10 23:19:38 iliaa Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -3117,7 +3117,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;
}
@@ -3238,7 +3238,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
