tony2001 Thu Sep 28 12:55:15 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard url.c
Log:
MFH: fix #38981 (using FTP URLs in get_headers() causes crash)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url.c?r1=1.86.2.5.2.4&r2=1.86.2.5.2.5&diff_format=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.86.2.5.2.4
php-src/ext/standard/url.c:1.86.2.5.2.5
--- php-src/ext/standard/url.c:1.86.2.5.2.4 Mon Sep 25 16:00:43 2006
+++ php-src/ext/standard/url.c Thu Sep 28 12:55:15 2006
@@ -15,7 +15,7 @@
| Author: Jim Winstead <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: url.c,v 1.86.2.5.2.4 2006/09/25 16:00:43 iliaa Exp $ */
+/* $Id: url.c,v 1.86.2.5.2.5 2006/09/28 12:55:15 tony2001 Exp $ */
#include <stdlib.h>
#include <string.h>
@@ -675,6 +675,11 @@
RETURN_FALSE;
}
+ if (!stream->wrapperdata || Z_TYPE_P(stream->wrapperdata) != IS_ARRAY) {
+ php_stream_close(stream);
+ RETURN_FALSE;
+ }
+
array_init(return_value);
/* check for curl-wrappers that provide headers via a special "headers"
element */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
