iliaa           Mon Mar 14 19:30:04 2005 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/openssl        openssl.c 
  Log:
  MFH: Fixed possible usage of str without being initialized.
  
  
http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.52.2.21&r2=1.52.2.22&ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.52.2.21 
php-src/ext/openssl/openssl.c:1.52.2.22
--- php-src/ext/openssl/openssl.c:1.52.2.21     Mon Mar 14 16:01:02 2005
+++ php-src/ext/openssl/openssl.c       Mon Mar 14 19:30:02 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: openssl.c,v 1.52.2.21 2005/03/14 21:01:02 sniper Exp $ */
+/* $Id: openssl.c,v 1.52.2.22 2005/03/15 00:30:02 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -254,7 +254,9 @@
                } else {
                        zval_dtor(subentries);
                        FREE_ZVAL(subentries);
-                       add_assoc_stringl(subitem, sname, str->data, 
str->length, 1);
+                       if (obj_cnt) {
+                               add_assoc_stringl(subitem, sname, str->data, 
str->length, 1);
+                       }
                }
        }
        zend_hash_update(HASH_OF(val), key, strlen(key) + 1, (void *)&subitem, 
sizeof(subitem), NULL);

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

Reply via email to