cvs: php-src(PHP_5_2) /ext/iconv iconv.c
| From: | Antony Dovgal | Date: | Thu, 27 Sep 2007 09:19:07 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/iconv iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-46310@lists.php.net to get a copy of this message | ||
tony2001 Thu Sep 27 09:19:07 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/iconv iconv.c
Log:
MFH: fix coverity issue #412
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.124.2.8.2.20&r2=1.124.2.8.2.21&diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.124.2.8.2.20 php-src/ext/iconv/iconv.c:1.124.2.8.2.21
--- php-src/ext/iconv/iconv.c:1.124.2.8.2.20 Fri Sep 21 13:37:30 2007
+++ php-src/ext/iconv/iconv.c Thu Sep 27 09:19:06 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.124.2.8.2.20 2007/09/21 13:37:30 tony2001 Exp $ */
+/* $Id: iconv.c,v 1.124.2.8.2.21 2007/09/27 09:19:06 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2271,12 +2271,10 @@
}
if (header_name != NULL) {
- zval **elem;
+ zval **elem, *new_elem;
if (zend_hash_find(Z_ARRVAL_P(return_value), header_name, header_name_len, (void **)&elem)
== SUCCESS) {
if (Z_TYPE_PP(elem) != IS_ARRAY) {
- zval *new_elem;
-
MAKE_STD_ZVAL(new_elem);
array_init(new_elem);