From 9de20963cd6eddf1ef1e3d3ec5ee65d537af4b04 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 7 Sep 2015 19:21:12 +0200 Subject: [PATCH] Fix beautiful textbook case of string overflow in `BLI_testextensie_glob`... --- source/blender/blenlib/intern/path_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 3a73d4cc0c7..656657aae12 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -1610,16 +1610,16 @@ bool BLI_testextensie_glob(const char *str, const char *ext_fnmatch) while (ext_step[0]) { const char *ext_next; - int len_ext; + size_t len_ext; if ((ext_next = strchr(ext_step, ';'))) { - len_ext = (int)(ext_next - ext_step) + 1; + len_ext = ext_next - ext_step + 1; } else { len_ext = sizeof(pattern); } - BLI_strncpy(pattern, ext_step, len_ext); + len_ext = BLI_strncpy_rlen(pattern, ext_step, len_ext); if (fnmatch(pattern, str, FNM_CASEFOLD) == 0) { return true;