diff options
author | Bastien Montagne <bastien@blender.org> | 2020-10-26 18:31:11 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2020-10-28 11:26:59 +0300 |
commit | 8926b09fa9a065912aa0237015c6085200834cd3 (patch) | |
tree | 4205bd10c216732541d8ba35fbe401fb593d2bea /tests | |
parent | c2535dff902641ab331301fb8edc788c2c132a34 (diff) |
Fix T81421: "Saving As..." a blend file with a Script node file path filled with 1023 symbols crashes Blender.
Usual lack of protection against buffer overflows when manipulating
strings.
Also add some basic tests for `BLI_path_rel`.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/gtests/blenlib/BLI_path_util_test.cc | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/tests/gtests/blenlib/BLI_path_util_test.cc b/tests/gtests/blenlib/BLI_path_util_test.cc index 480d48d6080..edc2b1189fe 100644 --- a/tests/gtests/blenlib/BLI_path_util_test.cc +++ b/tests/gtests/blenlib/BLI_path_util_test.cc @@ -633,3 +633,53 @@ TEST(path_util, PathExtension) EXPECT_STREQ(".abc", BLI_path_extension("C:\\some.def\\file.abc")); EXPECT_STREQ(".001", BLI_path_extension("Text.001")); } + +/* BLI_path_rel. */ + +#define PATH_REL(abs_path, ref_path, rel_path) \ + { \ + char path[FILE_MAX]; \ + BLI_strncpy(path, abs_path, sizeof(path)); \ + BLI_path_rel(path, ref_path); \ + EXPECT_STREQ(rel_path, path); \ + } \ + void(0) + +TEST(path_util, PathRelPath) +{ + PATH_REL("/foo/bar/blender.blend", "/foo/bar/", "//blender.blend"); + PATH_REL("/foo/bar/blender.blend", "/foo/bar", "//bar/blender.blend"); + + /* Check for potential buffer overflows. */ + { + char abs_path_in[FILE_MAX]; + abs_path_in[0] = '/'; + for (int i = 1; i < FILE_MAX - 1; i++) { + abs_path_in[i] = 'A'; + } + abs_path_in[FILE_MAX - 1] = '\0'; + char abs_path_out[FILE_MAX]; + abs_path_out[0] = '/'; + abs_path_out[1] = '/'; + for (int i = 2; i < FILE_MAX - 1; i++) { + abs_path_out[i] = 'A'; + } + abs_path_out[FILE_MAX - 1] = '\0'; + PATH_REL(abs_path_in, "/", abs_path_out); + + const char *ref_path_in = "/foo/bar/"; + const size_t ref_path_in_len = strlen(ref_path_in); + strcpy(abs_path_in, ref_path_in); + for (int i = ref_path_in_len; i < FILE_MAX - 1; i++) { + abs_path_in[i] = 'A'; + } + abs_path_in[FILE_MAX - 1] = '\0'; + abs_path_out[0] = '/'; + abs_path_out[1] = '/'; + for (int i = 2; i < FILE_MAX - ((int)ref_path_in_len - 1); i++) { + abs_path_out[i] = 'A'; + } + abs_path_out[FILE_MAX - (ref_path_in_len - 1)] = '\0'; + PATH_REL(abs_path_in, ref_path_in, abs_path_out); + } +} |