cvs: php-src(PHP_5_2) /ext/iconv iconv.c
| From: | Antony Dovgal | Date: | Fri, 21 Sep 2007 13:37:30 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/iconv iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-46261@lists.php.net to get a copy of this message | ||
tony2001 Fri Sep 21 13:37:30 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/iconv iconv.c
Log:
MFH: plug leak on error (coverity issue #407)
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.124.2.8.2.19&r2=1.124.2.8.2.20&diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.124.2.8.2.19 php-src/ext/iconv/iconv.c:1.124.2.8.2.20
--- php-src/ext/iconv/iconv.c:1.124.2.8.2.19 Thu Sep 20 22:35:24 2007
+++ php-src/ext/iconv/iconv.c Fri Sep 21 13:37:30 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.124.2.8.2.19 2007/09/20 22:35:24 stas Exp $ */
+/* $Id: iconv.c,v 1.124.2.8.2.20 2007/09/21 13:37:30 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -851,6 +851,9 @@
cd = iconv_open(GENERIC_SUPERSET_NAME, enc);
if (cd == (iconv_t)(-1)) {
+ if (ndl_buf != NULL) {
+ efree(ndl_buf);
+ }
#if ICONV_SUPPORTS_ERRNO
if (errno == EINVAL) {
return PHP_ICONV_ERR_WRONG_CHARSET;