Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2020-10-26 18:31:11 +0300
committerBastien Montagne <bastien@blender.org>2020-10-26 19:36:53 +0300
commit01d3fbc496a2d2ce09910754b47306fb719cb940 (patch)
tree5cd96d36add3ab17cc1fcc7efe96659492ef23ab /source/blender/blenlib/tests
parent47eabae951b059f9ecb753cec96bf27b187a5522 (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 'source/blender/blenlib/tests')
-rw-r--r--source/blender/blenlib/tests/BLI_path_util_test.cc50
1 files changed, 50 insertions, 0 deletions
diff --git a/source/blender/blenlib/tests/BLI_path_util_test.cc b/source/blender/blenlib/tests/BLI_path_util_test.cc
index 5556062233e..5ec057a8501 100644
--- a/source/blender/blenlib/tests/BLI_path_util_test.cc
+++ b/source/blender/blenlib/tests/BLI_path_util_test.cc
@@ -600,3 +600,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);
+ }
+}