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

[Dmitry Stogov]

dmitry          Wed Jul 11 07:26:52 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/openssl        openssl.c 
  Log:
  Fixed crash on non-string passphrase
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.35&r2=1.98.2.5.2.36&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.35 
php-src/ext/openssl/openssl.c:1.98.2.5.2.36
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.35 Tue Jun 19 22:09:49 2007
+++ php-src/ext/openssl/openssl.c       Wed Jul 11 07:26:52 2007
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: openssl.c,v 1.98.2.5.2.35 2007/06/19 22:09:49 iliaa Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.36 2007/07/11 07:26:52 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2256,6 +2256,7 @@
                } else {
                        tmp = **zphrase;
                        zval_copy_ctor(&tmp);
+                       convert_to_string(&tmp);
                        passphrase = Z_STRVAL(tmp);
                }
 

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