tony2001                Thu Sep 28 12:55:03 2006 UTC

  Modified files:              
    /php-src/ext/standard       url.c 
  Log:
  fix #38981 (using FTP URLs in get_headers() causes crash)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url.c?r1=1.97&r2=1.98&diff_format=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.97 php-src/ext/standard/url.c:1.98
--- php-src/ext/standard/url.c:1.97     Mon Sep 25 16:02:19 2006
+++ php-src/ext/standard/url.c  Thu Sep 28 12:55:02 2006
@@ -15,7 +15,7 @@
    | Author: Jim Winstead <[EMAIL PROTECTED]>                                  
|
    +----------------------------------------------------------------------+
  */
-/* $Id: url.c,v 1.97 2006/09/25 16:02:19 iliaa Exp $ */
+/* $Id: url.c,v 1.98 2006/09/28 12:55:02 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

Reply via email to