php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 03:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

- mark extractTo as U-ready, path and filenames are now encoded correctly

Browse Source
This commit is contained in:
Pierre Joye
2006-10-31 19:34:41 +00:00
parent f7600a7b67
commit e03046e2fb
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ext/zip/php_zip.c
View File

@@ -1658,6 +1658,7 @@ ZIPARCHIVE_METHOD(extractTo)
zval **pathto_zval;
char *pathto;
char *file;
int file_len;
int pathto_len;
int ret, i;
@@ -1691,9 +1692,22 @@ ZIPARCHIVE_METHOD(extractTo)
if (zval_files) {
switch (Z_TYPE_P(zval_files)) {
case IS_UNICODE:
if (FAILURE == php_stream_path_param_encode(&zval_files, &file, &file_len, REPORT_ERRORS, FG(default_context))) {
RETURN_FALSE;
}
case IS_STRING:
file = Z_STRVAL_P(zval_files);
if (Z_TYPE_P(zval_files) != IS_UNICODE) {
file_len = Z_STRLEN_P(zval_files);
file = Z_STRVAL_P(zval_files);
}
if (file_len < 1) {
efree(file);
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Empty string as filename");
RETURN_FALSE;
}
if (!php_zip_extract_file(intern, pathto, file TSRMLS_CC)) {
efree(file);
RETURN_FALSE;
}
break;
@@ -1707,9 +1721,23 @@ ZIPARCHIVE_METHOD(extractTo)
switch (Z_TYPE_PP(zval_file)) {
case IS_LONG:
break;
case IS_UNICODE:
if (FAILURE == php_stream_path_param_encode(zval_file, &file, &file_len, REPORT_ERRORS, FG(default_context))) {
RETURN_FALSE;
}
case IS_STRING:
file = Z_STRVAL_PP(zval_file);
if (Z_TYPE_P(zval_files) != IS_UNICODE) {
file_len = Z_STRLEN_PP(zval_file);
file = Z_STRVAL_PP(zval_file);
}
if (file_len < 1) {
efree(file);
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Empty string as filename");
RETURN_FALSE;
}
if (!php_zip_extract_file(intern, pathto, file TSRMLS_CC)) {
efree(file);
RETURN_FALSE;
}
break;