Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: unzipping with backslashes in the name on UNIX #834

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: unzipping with backslashes in the name on UNIX #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions mz_os.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ int32_t mz_path_append_slash(char *path, int32_t max_path, char slash) {
int32_t path_len = (int32_t)strlen(path);
if ((path_len + 2) >= max_path)
return MZ_BUF_ERROR;
if (path[path_len - 1] != '\\' && path[path_len - 1] != '/') {
if (!mz_os_is_dir_separator(path[path_len - 1])) {
path[path_len] = slash;
path[path_len + 1] = 0;
}
Expand All @@ -56,7 +56,7 @@ int32_t mz_path_append_slash(char *path, int32_t max_path, char slash) {
int32_t mz_path_remove_slash(char *path) {
int32_t path_len = (int32_t)strlen(path);
while (path_len > 0) {
if (path[path_len - 1] == '\\' || path[path_len - 1] == '/')
if (mz_os_is_dir_separator(path[path_len - 1]))
path[path_len - 1] = 0;
else
break;
Expand All @@ -68,7 +68,7 @@ int32_t mz_path_remove_slash(char *path) {

int32_t mz_path_has_slash(const char *path) {
int32_t path_len = (int32_t)strlen(path);
if (path_len > 0 && path[path_len - 1] != '\\' && path[path_len - 1] != '/')
if (path_len > 0 && !mz_os_is_dir_separator(path[path_len - 1]))
return MZ_EXIST_ERROR;
return MZ_OK;
}
Expand All @@ -77,7 +77,7 @@ int32_t mz_path_convert_slashes(char *path, char slash) {
int32_t i = 0;

for (i = 0; i < (int32_t)strlen(path); i += 1) {
if (path[i] == '\\' || path[i] == '/')
if (mz_os_is_dir_separator(path[i]))
path[i] = slash;
}
return MZ_OK;
Expand Down Expand Up @@ -136,12 +136,12 @@ int32_t mz_path_resolve(const char *path, char *output, int32_t max_output) {

while (*source != 0 && max_output > 1) {
check = source;
if (*check == '\\' || *check == '/')
if (mz_os_is_dir_separator(*check))
check += 1;

if (source == path || target == output || check != source) {
/* Skip double paths */
if (*check == '\\' || *check == '/') {
if (mz_os_is_dir_separator(*check)) {
source += 1;
continue;
}
Expand All @@ -158,7 +158,7 @@ int32_t mz_path_resolve(const char *path, char *output, int32_t max_output) {
continue;
}
/* Remove . if not at end of string */
else if (*check == '\\' || *check == '/') {
else if (mz_os_is_dir_separator(*check)) {
source += (check - source);
/* Skip slash if at beginning of string */
if (target == output && *source != 0)
Expand All @@ -168,14 +168,14 @@ int32_t mz_path_resolve(const char *path, char *output, int32_t max_output) {
/* Go to parent directory .. */
else if (*check == '.') {
check += 1;
if (*check == 0 || (*check == '\\' || *check == '/')) {
if (*check == 0 || mz_os_is_dir_separator(*check)) {
source += (check - source);

/* Search backwards for previous slash or the start of the output string */
if (target != output) {
target -= 1;
do {
if (target == output || *target == '\\' || *target == '/')
if (target == output || mz_os_is_dir_separator(*target))
break;

target -= 1;
Expand All @@ -185,7 +185,7 @@ int32_t mz_path_resolve(const char *path, char *output, int32_t max_output) {

if ((target == output) && *source != 0)
source += 1;
if ((*target == '\\' || *target == '/') && *source == 0)
if (mz_os_is_dir_separator(*target) && *source == 0)
target += 1;

*target = 0;
Expand Down Expand Up @@ -219,7 +219,7 @@ int32_t mz_path_remove_filename(char *path) {
path_ptr = path + strlen(path) - 1;

while (path_ptr > path) {
if ((*path_ptr == '/') || (*path_ptr == '\\')) {
if (mz_os_is_dir_separator(*path_ptr)) {
*path_ptr = 0;
break;
}
Expand All @@ -242,7 +242,7 @@ int32_t mz_path_remove_extension(char *path) {
path_ptr = path + strlen(path) - 1;

while (path_ptr > path) {
if ((*path_ptr == '/') || (*path_ptr == '\\'))
if (mz_os_is_dir_separator(*path_ptr))
break;
if (*path_ptr == '.') {
*path_ptr = 0;
Expand All @@ -267,7 +267,7 @@ int32_t mz_path_get_filename(const char *path, const char **filename) {
*filename = NULL;

for (match = path; *match != 0; match += 1) {
if ((*match == '\\') || (*match == '/'))
if (mz_os_is_dir_separator(*match))
*filename = match + 1;
}

Expand Down Expand Up @@ -296,7 +296,7 @@ int32_t mz_dir_make(const char *path) {
if (err != MZ_OK) {
match = current_dir + 1;
while (1) {
while (*match != 0 && *match != '\\' && *match != '/')
while (*match != 0 && !mz_os_is_dir_separator(*match))
match += 1;
hold = *match;
*match = 0;
Expand Down
3 changes: 3 additions & 0 deletions mz_os.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ struct dirent *mz_os_read_dir(DIR *dir);
int32_t mz_os_close_dir(DIR *dir);
/* Closes a directory that has been opened for listing */

int32_t mz_os_is_dir_separator(const char c);
/* Checks to see if character is a directory separator */

int32_t mz_os_is_dir(const char *path);
/* Checks to see if path is a directory */

Expand Down
4 changes: 4 additions & 0 deletions mz_os_posix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,10 @@ int32_t mz_os_close_dir(DIR *dir) {
return MZ_OK;
}

int32_t mz_os_is_dir_separator(const char c) {
return c == '/';
}

int32_t mz_os_is_dir(const char *path) {
struct stat path_stat;

Expand Down
4 changes: 4 additions & 0 deletions mz_os_win32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,10 @@ int32_t mz_os_close_dir(DIR *dir) {
return MZ_OK;
}

int32_t mz_os_is_dir_separator(const char c) {
return c == '\\' || c == '/';
}

int32_t mz_os_is_dir(const char *path) {
wchar_t *path_wide = NULL;
uint32_t attribs = 0;
Expand Down
2 changes: 0 additions & 2 deletions mz_zip_rw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,11 +654,9 @@ int32_t mz_zip_reader_entry_save_file(void *handle, const char *path) {
if (!reader->file_info || !path)
return MZ_PARAM_ERROR;

/* Convert to forward slashes for unix which doesn't like backslashes */
pathwfs = (char *)strdup(path);
if (!pathwfs)
return MZ_MEM_ERROR;
mz_path_convert_slashes(pathwfs, MZ_PATH_SLASH_UNIX);

if (reader->entry_cb)
reader->entry_cb(handle, reader->entry_userdata, reader->file_info, pathwfs);
Expand Down
Binary file added test/fuzz/unzip_fuzzer_seed_corpus/dot_dot_backslash_name.zip
View file
Open in desktop
Binary file not shown.
Loading