diff options
| author | Pierre Joye <pajoye@php.net> | 2008-08-08 15:37:37 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-08-08 15:37:37 +0000 |
| commit | 5505650cdf6c726c3b4f320affe52ee644d20d65 (patch) | |
| tree | 43d00d89ec4eafd11ae2a0c5f61a0405400f7191 /ext/zip/php_zip.c | |
| parent | 4c3563dea211e018765308e829f7c0558025c6c9 (diff) | |
| download | php-git-5505650cdf6c726c3b4f320affe52ee644d20d65.tar.gz | |
- use OPENBASEDIR_CHECKPATH instead of SAFEMODE_CHECKFILE, easier to keep code synced with HEAD
Diffstat (limited to 'ext/zip/php_zip.c')
| -rw-r--r-- | ext/zip/php_zip.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 5773bdb166..461a9c045c 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -59,15 +59,6 @@ static int le_zip_entry; #define le_zip_entry_name "Zip Entry" /* }}} */ -/* {{{ SAFEMODE_CHECKFILE(filename) */ -#if (PHP_MAJOR_VERSION < 6) -#define SAFEMODE_CHECKFILE(filename) \ - (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC) -#else -#define SAFEMODE_CHECKFILE(filename) (0) -#endif -/* }}} */ - /* {{{ PHP_ZIP_STAT_INDEX(za, index, flags, sb) */ #define PHP_ZIP_STAT_INDEX(za, index, flags, sb) \ if (zip_stat_index(za, index, flags, &sb) != 0) { \ @@ -142,7 +133,7 @@ static int php_zip_extract_file(struct zip * za, char *dest, char *file, int fil php_basename(file, file_len, NULL, 0, &file_basename, (unsigned int *)&file_basename_len TSRMLS_CC); - if (SAFEMODE_CHECKFILE(file_dirname_fullpath)) { + if (OPENBASEDIR_CHECKPATH(file_dirname_fullpath)) { efree(file_dirname_fullpath); efree(file_basename); return 0; @@ -191,7 +182,7 @@ static int php_zip_extract_file(struct zip * za, char *dest, char *file, int fil * is required, does a file can have a different * safemode status as its parent folder? */ - if (SAFEMODE_CHECKFILE(fullpath)) { + if (OPENBASEDIR_CHECKPATH(fullpath)) { efree(file_dirname_fullpath); efree(file_basename); return 0; @@ -236,7 +227,7 @@ static int php_zip_add_file(struct zip *za, const char *filename, int filename_l char resolved_path[MAXPATHLEN]; - if (SAFEMODE_CHECKFILE(filename)) { + if (OPENBASEDIR_CHECKPATH(filename)) { return -1; } @@ -1103,7 +1094,7 @@ static PHP_NAMED_FUNCTION(zif_zip_open) return; } - if (SAFEMODE_CHECKFILE(filename)) { + if (OPENBASEDIR_CHECKPATH(filename)) { RETURN_FALSE; } |