cvs: php-src(PHP_5_2) /ext/openssl openssl.c
| From: | Ilia Alshanetsky | Date: | Mon, 31 Jul 2006 03:41:20 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/openssl openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-39666@lists.php.net to get a copy of this message | ||
iliaa Mon Jul 31 03:41:20 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/openssl openssl.c
Log:
Fixed compiler warning.
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.8&r2=1.98.2.5.2.9&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.8 php-src/ext/openssl/openssl.c:1.98.2.5.2.9
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.8 Mon Jul 31 00:33:41 2006
+++ php-src/ext/openssl/openssl.c Mon Jul 31 03:41:19 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.8 2006/07/31 00:33:41 pajoye Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.9 2006/07/31 03:41:19 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -238,7 +238,7 @@
char *sname;
int nid;
X509_NAME_ENTRY * ne;
- ASN1_STRING * str;
+ ASN1_STRING * str = NULL;
ASN1_OBJECT * obj;
MAKE_STD_ZVAL(subitem);
@@ -279,7 +279,7 @@
} else {
zval_dtor(subentries);
FREE_ZVAL(subentries);
- if (obj_cnt) {
+ if (obj_cnt && str) {
add_assoc_stringl(subitem, sname, (char *)str->data, str->length, 1);
}
}