iliaa Mon Mar 14 19:29:36 2005 EDT
Modified files: (Branch: PHP_5_0)
/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.89.2.5&r2=1.89.2.6&ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.89.2.5
php-src/ext/openssl/openssl.c:1.89.2.6
--- php-src/ext/openssl/openssl.c:1.89.2.5 Mon Mar 14 16:00:21 2005
+++ php-src/ext/openssl/openssl.c Mon Mar 14 19:29:36 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.89.2.5 2005/03/14 21:00:21 sniper Exp $ */
+/* $Id: openssl.c,v 1.89.2.6 2005/03/15 00:29:36 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -273,7 +273,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
