cvs: php-src(PHP_5_2) /ext/openssl openssl.c
| From: | Pierre-Alain Joye | Date: | Sat, 29 Jul 2006 22:39:33 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/openssl openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-39630@lists.php.net to get a copy of this message | ||
pajoye Sat Jul 29 22:39:33 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/openssl openssl.c
Log:
- #38255, fails on array as well
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.1&r2=1.98.2.5.2.2&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.1 php-src/ext/openssl/openssl.c:1.98.2.5.2.2
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.1 Sat Jul 29 22:10:49 2006
+++ php-src/ext/openssl/openssl.c Sat Jul 29 22:39:33 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.1 2006/07/29 22:10:49 pajoye Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.2 2006/07/29 22:39:33 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1836,7 +1836,8 @@
return NULL;
} else {
/* force it to be a string and check if it refers to a file */
- if (Z_TYPE_PP(val) == IS_LONG || Z_TYPE_PP(val) == IS_BOOL) {
+ if (Z_TYPE_PP(val) == IS_LONG || Z_TYPE_PP(val) == IS_BOOL
+ || Z_TYPE_PP(val) == IS_ARRAY) {
return NULL;
}
convert_to_string_ex(val);