cvs: php-src(PHP_5_2) /ext/iconv iconv.c
| From: | Antony Dovgal | Date: | Wed, 30 Aug 2006 16:12:43 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/iconv iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-40192@lists.php.net to get a copy of this message | ||
tony2001 Wed Aug 30 16:12:43 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/iconv iconv.c
Log:
fix leak
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.124.2.8.2.2&r2=1.124.2.8.2.3&diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.124.2.8.2.2 php-src/ext/iconv/iconv.c:1.124.2.8.2.3
--- php-src/ext/iconv/iconv.c:1.124.2.8.2.2 Sat Jun 17 13:06:06 2006
+++ php-src/ext/iconv/iconv.c Wed Aug 30 16:12:43 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.124.2.8.2.2 2006/06/17 13:06:06 bjori Exp $ */
+/* $Id: iconv.c,v 1.124.2.8.2.3 2006/08/30 16:12:43 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2278,7 +2278,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl", &zv_string, &status)
== FAILURE)
return;
- convert_to_string_ex(&zv_string);
+ convert_to_string(zv_string);
if (SG(sapi_headers).mimetype &&
strncasecmp(SG(sapi_headers).mimetype, "text/", 5) == 0) {