[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zip php_zip.c

[Pierre-Alain Joye]

pajoye          Thu Aug 24 16:37:14 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/zip    php_zip.c 
  Log:
  - solve the relative path issues in TS environment
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.5&r2=1.1.2.6&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.5 php-src/ext/zip/php_zip.c:1.1.2.6
--- php-src/ext/zip/php_zip.c:1.1.2.5   Mon Aug 14 15:07:52 2006
+++ php-src/ext/zip/php_zip.c   Thu Aug 24 16:37:14 2006
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_zip.c,v 1.1.2.5 2006/08/14 15:07:52 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.1.2.6 2006/08/24 16:37:14 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -885,6 +885,7 @@
        int filename_len;
        int err = 0;
        long flags = 0;
+       char resolved_path[MAXPATHLEN + 1];
 
        zval *this = getThis();
        ze_zip_object *ze_obj = NULL;
@@ -903,6 +904,11 @@
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty string as 
source");
                RETURN_FALSE;
        }
+
+       if (!VCWD_REALPATH(filename, resolved_path)) {
+               RETURN_FALSE;
+       }
+
        if (ze_obj->za) {
                /* we already have an opened zip, free it */
                zip_close(ze_obj->za);
@@ -910,12 +916,11 @@
        if (ze_obj->filename) {
                efree(ze_obj->filename);
        }
-
-       intern = zip_open(filename, flags, &err);
+       intern = zip_open(resolved_path, flags, &err);
        if (!intern || err) {
                RETURN_LONG((long)err);
        }
-       ze_obj->filename = estrndup(filename, filename_len);
+       ze_obj->filename = estrndup(resolved_path, strlen(resolved_path));
        ze_obj->filename_len = filename_len;
        ze_obj->za = intern;
        RETURN_TRUE;
@@ -964,6 +969,7 @@
        struct zip_source *zs;
        long offset_start = 0, offset_len = 0;
        int cur_idx;
+       char resolved_path[MAXPATHLEN + 1];
 
        if (!this) {
                RETURN_FALSE;
@@ -991,7 +997,11 @@
                RETURN_FALSE;
        }
 
-       zs = zip_source_file(intern, filename, 0, 0);
+       if (!VCWD_REALPATH(filename, resolved_path)) {
+               RETURN_FALSE;
+       }
+
+       zs = zip_source_file(intern, resolved_path, 0, 0);
        if (!zs) {
                RETURN_FALSE;
        }
@@ -1972,7 +1982,7 @@
        php_info_print_table_start();
 
        php_info_print_table_row(2, "Zip", "enabled");
-       php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 
1.1.2.5 2006/08/14 15:07:52 pajoye Exp $");
+       php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 
1.1.2.6 2006/08/24 16:37:14 pajoye Exp $");
        php_info_print_table_row(2, "Zip version", "1.4.0");
        php_info_print_table_row(2, "Libzip version", "0.7.1");
 

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