cvs: php-src(PHP_5_2) /ext/zip php_zip.c

pajoye Wed Mar 14 12:06:20 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/zip php_zip.c Log: - MFH: openbasedir and safemode check in ::open() http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.29&r2=1.1.2.30&diff_format=u Index: php-src/ext/zip/php_zip.c diff -u php-src/ext/zip/php_zip.c:1.1.2.29 php-src/ext/zip/php_zip.c:1.1.2.30 --- php-src/ext/zip/php_zip.c:1.1.2.29 Wed Mar 14 11:32:25 2007 +++ php-src/ext/zip/php_zip.c Wed Mar 14 12:06:20 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zip.c,v 1.1.2.29 2007/03/14 11:32:25 pajoye Exp $ */ +/* $Id: php_zip.c,v 1.1.2.30 2007/03/14 12:06:20 pajoye Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -917,6 +917,10 @@ RETURN_FALSE; } + if (OPENBASEDIR_CHECKPATH(filename)) { + RETURN_FALSE; + } + if (!expand_filepath(filename, resolved_path TSRMLS_CC)) { RETURN_FALSE; } @@ -2022,7 +2026,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.29 2007/03/14 11:32:25 pajoye Exp $"); + php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.1.2.30 2007/03/14 12:06:20 pajoye Exp $"); php_info_print_table_row(2, "Zip version", "2.0.0"); php_info_print_table_row(2, "Libzip version", "0.7.1");