c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added more test cases for path resolving.

Browse Source 
Fixed branching in resolve function.
This commit is contained in:
Nathan Moinvaziri 2019-10-29 17:02:46 -07:00
parent e22948c731
commit d82ea2c654
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mz_os.c
View File

@ -170,8 +170,8 @@ int32_t mz_path_resolve(const char *path, char *output, int32_t max_output)
{ {
check += 1; check += 1;
/* Remove current directory . if at end of string */ /* Remove . if at end of string and not at the beginning */
if ((*check == 0) && (source != path)) if ((*check == 0) && (source != path && target != output))
{ {
/* Copy last slash */ /* Copy last slash */
*target = *source; *target = *source;
@ -180,20 +180,17 @@ int32_t mz_path_resolve(const char *path, char *output, int32_t max_output)
source += (check - source); source += (check - source);
continue; continue;
} }
/* Remove . if not at end of string */
/* Remove current directory . if not at end of string */ else if ((*check == '\\') || (*check == '/'))
if ((*check == 0) || (*check == '\\' || *check == '/'))
{ {
/* Only proceed if .\ is not entire string */ source += (check - source);
if (check[1] != 0 || (path != source)) /* Skip slash if at beginning of string */
{ if (target == output && *source != 0)
source += (check - source); source += 1;
continue; continue;
}
} }
/* Go to parent directory .. */ /* Go to parent directory .. */
if ((*check != 0) || (*check == '.')) else if (*check == '.')
{ {
check += 1; check += 1;
if ((*check == 0) || (*check == '\\' || *check == '/')) if ((*check == 0) || (*check == '\\' || *check == '/'))

7
test/test.c
View File

@ -45,13 +45,14 @@ void test_path_resolve_int(char *path, char *expected_path)
memset(output, 'z', sizeof(output)); memset(output, 'z', sizeof(output));
mz_path_resolve(path, output, sizeof(output)); mz_path_resolve(path, output, sizeof(output));
ok = (strcmp(output, expected_path) == 0); ok = (strcmp(output, expected_path) == 0);
printf("path resolve - %s -> %s (%" PRId32 ")\n", path, expected_path, ok); printf("path resolve - %s -> %s = %s (%" PRId32 ")\n", path, expected_path, output, ok);
} }
void test_path_resolve(void) void test_path_resolve(void)
{ {
test_path_resolve_int("c:\\test\\.", "c:\\test\\"); test_path_resolve_int("c:\\test\\.", "c:\\test\\");
test_path_resolve_int("c:\\test\\.\\", "c:\\test\\"); test_path_resolve_int("c:\\test\\.\\", "c:\\test\\");
test_path_resolve_int("c:\\test\\.\\.", "c:\\test\\");
test_path_resolve_int("c:\\test\\..", "c:\\"); test_path_resolve_int("c:\\test\\..", "c:\\");
test_path_resolve_int("c:\\test\\..\\", "c:\\"); test_path_resolve_int("c:\\test\\..\\", "c:\\");
test_path_resolve_int("c:\\test\\.\\..", "c:\\"); test_path_resolve_int("c:\\test\\.\\..", "c:\\");
@ -60,11 +61,15 @@ void test_path_resolve(void)
test_path_resolve_int(".\\", ""); test_path_resolve_int(".\\", "");
test_path_resolve_int("..", ""); test_path_resolve_int("..", "");
test_path_resolve_int("..\\", ""); test_path_resolve_int("..\\", "");
test_path_resolve_int(".\\test\\123", "test\\123");
test_path_resolve_int(".\\..\\test\\123", "test\\123");
test_path_resolve_int("..\\..\\test\\123", "test\\123"); test_path_resolve_int("..\\..\\test\\123", "test\\123");
test_path_resolve_int("test\\.abc.txt", "test\\.abc.txt");
test_path_resolve_int("c:\\test\\123\\.\\abc.txt", "c:\\test\\123\\abc.txt"); test_path_resolve_int("c:\\test\\123\\.\\abc.txt", "c:\\test\\123\\abc.txt");
test_path_resolve_int("c:\\test\\123\\..\\abc.txt", "c:\\test\\abc.txt"); test_path_resolve_int("c:\\test\\123\\..\\abc.txt", "c:\\test\\abc.txt");
test_path_resolve_int("c:\\test\\123\\..\\..\\abc.txt", "c:\\abc.txt"); test_path_resolve_int("c:\\test\\123\\..\\..\\abc.txt", "c:\\abc.txt");
test_path_resolve_int("c:\\test\\123\\..\\..\\..\\abc.txt", "abc.txt"); test_path_resolve_int("c:\\test\\123\\..\\..\\..\\abc.txt", "abc.txt");
test_path_resolve_int("c:\\test\\123\\..\\.\\..\\abc.txt", "c:\\abc.txt");
} }
void test_encrypt(char *method, mz_stream_create_cb crypt_create, char *password) void test_encrypt(char *method, mz_stream_create_cb crypt_create, char *password)