[PHP-CVS] cvs: php-src /ext/standard url.c

[Antony Dovgal]

tony2001                Sat Sep 23 11:58:49 2006 UTC

  Modified files:              
    /php-src/ext/standard       url.c 
  Log:
  fix possible segfault in #38891
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url.c?r1=1.95&r2=1.96&diff_format=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.95 php-src/ext/standard/url.c:1.96
--- php-src/ext/standard/url.c:1.95     Tue Sep 19 10:38:31 2006
+++ php-src/ext/standard/url.c  Sat Sep 23 11:58:49 2006
@@ -15,7 +15,7 @@
    | Author: Jim Winstead <[EMAIL PROTECTED]>                                  
|
    +----------------------------------------------------------------------+
  */
-/* $Id: url.c,v 1.95 2006/09/19 10:38:31 dmitry Exp $ */
+/* $Id: url.c,v 1.96 2006/09/23 11:58:49 tony2001 Exp $ */
 
 #include <stdlib.h>
 #include <string.h>
@@ -678,6 +678,11 @@
 
        zend_hash_internal_pointer_reset_ex(HASH_OF(stream->wrapperdata), &pos);
        while (zend_hash_get_current_data_ex(HASH_OF(stream->wrapperdata), 
(void**)&hdr, &pos) != FAILURE) {
+               if (!hdr || Z_TYPE_PP(hdr) != IS_STRING) {
+                       zend_hash_move_forward_ex(HASH_OF(stream->wrapperdata), 
&pos);
+                       continue;
+               }
+
                if (!format) {
 no_name_header:
                        add_next_index_stringl(return_value, Z_STRVAL_PP(hdr), 
Z_STRLEN_PP(hdr), 1);

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