Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T46056: User Preferences-> install from File freezes Blender.

Browse Source 
Own stupid error in recent fix for buffer overflow in `BLI_testextensie_glob()`...
Also found & fixed another potential buffer overflow in this func.
This commit is contained in:
Bastien Montagne
2015-09-09 11:02:32 +02:00
parent c87ee8da2c
commit ad86d6ebdc
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenlib/intern/path_util.c
View File

@@ -1614,13 +1614,12 @@ bool BLI_testextensie_glob(const char *str, const char *ext_fnmatch)
if ((ext_next = strchr(ext_step, ';'))) {
len_ext = ext_next - ext_step + 1;
BLI_strncpy(pattern, ext_step, (len_ext > sizeof(pattern)) ? sizeof(pattern) : len_ext);
}
else {
len_ext = sizeof(pattern);
len_ext = BLI_strncpy_rlen(pattern, ext_step, sizeof(pattern));
}
len_ext = BLI_strncpy_rlen(pattern, ext_step, len_ext);
if (fnmatch(pattern, str, FNM_CASEFOLD) == 0) {
return true;
}