pajoye Thu Aug 24 17:31:21 2006 UTC Modified files: /php-src/ext/zip php_zip.c Log: - MFB: solve the relative path issues in TS environment http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/zip/php_zip.c diff -u php-src/ext/zip/php_zip.c:1.6 php-src/ext/zip/php_zip.c:1.7 --- php-src/ext/zip/php_zip.c:1.6 Mon Aug 14 15:39:28 2006 +++ php-src/ext/zip/php_zip.c Thu Aug 24 17:31:20 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zip.c,v 1.6 2006/08/14 15:39:28 pajoye Exp $ */ +/* $Id: php_zip.c,v 1.7 2006/08/24 17:31:20 pajoye Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -862,6 +862,7 @@ int filename_len; int err = 0; long flags = 0; + char resolved_path[MAXPATHLEN + 1]; zval *this = getThis(); ze_zip_object *ze_obj = NULL; @@ -880,6 +881,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); @@ -888,7 +894,7 @@ efree(ze_obj->filename); } - intern = zip_open(filename, flags, &err); + intern = zip_open(resolved_path, flags, &err); if (!intern || err) { RETURN_LONG((long)err); } @@ -941,6 +947,7 @@ struct zip_source *zs; long offset_start = 0, offset_len = 0; int cur_idx; + char resolved_path[MAXPATHLEN + 1]; if (!this) { RETURN_FALSE; @@ -964,7 +971,11 @@ entry_name_len = filename_len; } - 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; } @@ -1945,7 +1956,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.6 2006/08/14 15:39:28 pajoye Exp $"); + php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.7 2006/08/24 17:31:20 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