cvs: php-src(PHP_5_2) /ext/openssl openssl.c

pajoye Sat Jul 29 23:03:55 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/openssl openssl.c Log: - MFH: make the test more obvious and add an explanation http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.3&r2=1.98.2.5.2.4&diff_format=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.3 php-src/ext/openssl/openssl.c:1.98.2.5.2.4 --- php-src/ext/openssl/openssl.c:1.98.2.5.2.3 Sat Jul 29 22:52:48 2006 +++ php-src/ext/openssl/openssl.c Sat Jul 29 23:03:55 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.98.2.5.2.3 2006/07/29 22:52:48 pajoye Exp $ */ +/* $Id: openssl.c,v 1.98.2.5.2.4 2006/07/29 23:03:55 pajoye Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1847,8 +1847,10 @@ 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 - || Z_TYPE_PP(val) == IS_ARRAY) { + /* passing non string values leaks, object uses toString, it returns NULL + * See bug38255.phpt + */ + if (!(Z_TYPE_PP(val) == IS_STRING || Z_TYPE_PP(val) == IS_OBJECT)) { return NULL; } convert_to_string_ex(val);