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

[Ilia Alshanetsky]

iliaa           Mon Jul 31 03:41:42 2006 UTC

  Modified files:              
    /php-src/ext/openssl        openssl.c 
  Log:
  MFB: Fixed compiler warning.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.115&r2=1.116&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.115 php-src/ext/openssl/openssl.c:1.116
--- php-src/ext/openssl/openssl.c:1.115 Mon Jul 31 00:36:09 2006
+++ php-src/ext/openssl/openssl.c       Mon Jul 31 03:41:42 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: openssl.c,v 1.115 2006/07/31 00:36:09 pajoye Exp $ */
+/* $Id: openssl.c,v 1.116 2006/07/31 03:41:42 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -224,7 +224,7 @@
        char *sname;
        int nid;
        X509_NAME_ENTRY * ne;
-       ASN1_STRING * str;
+       ASN1_STRING * str = NULL;
        ASN1_OBJECT * obj;
 
        MAKE_STD_ZVAL(subitem);
@@ -265,7 +265,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);
                        }
                }

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