[PHP-CVS] cvs: php-src /ext/iconv iconv.c

[Antony Dovgal]

tony2001                Thu Sep 27 09:18:36 2007 UTC

  Modified files:              
    /php-src/ext/iconv  iconv.c 
  Log:
  fix coverity issue #412
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.157&r2=1.158&diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.157 php-src/ext/iconv/iconv.c:1.158
--- php-src/ext/iconv/iconv.c:1.157     Fri Sep 21 13:41:02 2007
+++ php-src/ext/iconv/iconv.c   Thu Sep 27 09:18:36 2007
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: iconv.c,v 1.157 2007/09/21 13:41:02 tony2001 Exp $ */
+/* $Id: iconv.c,v 1.158 2007/09/27 09:18:36 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2338,12 +2338,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);
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php