[PHP-CVS] cvs: php-src(PHP_5_0) /ext/libxml libxml.c

[Rob Richards]

rrichards               Mon Sep  6 06:18:30 2004 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/ext/libxml libxml.c 
  Log:
  MFH: Fixed bug #29945 (simplexml_load_file URL limitation 255 char)
  
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.18.2.2&r2=1.18.2.3&ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.18.2.2 php-src/ext/libxml/libxml.c:1.18.2.3
--- php-src/ext/libxml/libxml.c:1.18.2.2        Thu Aug  5 17:03:15 2004
+++ php-src/ext/libxml/libxml.c Mon Sep  6 06:18:29 2004
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: libxml.c,v 1.18.2.2 2004/08/05 21:03:15 edink Exp $ */
+/* $Id: libxml.c,v 1.18.2.3 2004/09/06 10:18:29 rrichards Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -253,15 +253,18 @@
 
 void *php_libxml_streams_IO_open_wrapper(const char *filename, const char *mode, 
const int read_only)
 {
-       char resolved_path[MAXPATHLEN + 1];
        php_stream_statbuf ssbuf;
        php_stream_context *context = NULL;
        php_stream_wrapper *wrapper = NULL;
-       char *path_to_open = NULL;
+       char *resolved_path, *path_to_open = NULL;
+       void *ret_val = NULL;
 
        TSRMLS_FETCH();
-       xmlURIUnescapeString(filename, 0, resolved_path);
-       path_to_open = resolved_path;
+       resolved_path = xmlURIUnescapeString(filename, 0, NULL);
+
+       if (resolved_path == NULL) {
+               return NULL;
+       }
 
        /* logic copied from _php_stream_stat, but we only want to fail
           if the wrapper supports stat, otherwise, figure it out from
@@ -272,15 +275,20 @@
        wrapper = php_stream_locate_url_wrapper(resolved_path, &path_to_open, 
ENFORCE_SAFE_MODE TSRMLS_CC);
        if (wrapper && read_only && wrapper->wops->url_stat) {
                if (wrapper->wops->url_stat(wrapper, path_to_open, 0, &ssbuf, NULL 
TSRMLS_CC) == -1) {
+                       xmlFree(resolved_path);
                        return NULL;
                }
        }
 
        if (LIBXML(stream_context)) {
                context = zend_fetch_resource(&LIBXML(stream_context) TSRMLS_CC, -1, 
"Stream-Context", NULL, 1, php_le_stream_context());
-               return php_stream_open_wrapper_ex((char *)resolved_path, (char *)mode, 
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, context);
+               ret_val = php_stream_open_wrapper_ex(path_to_open, (char *)mode, 
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, context);
+               xmlFree(resolved_path);
+               return ret_val;
        }
-       return php_stream_open_wrapper((char *)resolved_path, (char *)mode, 
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
+       ret_val = php_stream_open_wrapper(path_to_open, (char *)mode, 
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
+       xmlFree(resolved_path);
+       return ret_val;
 }
 
 void *php_libxml_streams_IO_open_read_wrapper(const char *filename)

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