From c7bd3e69fae9e75ef390c1802acdbf6c01c16208 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 29 Aug 2021 20:49:47 +1000 Subject: [PATCH] Tracker: fix generating filename on duplicate sizeof for the pointer can't be used for buffer size calculation Change-Id: I9c6b04ebc7abc3864a64fb6202e457eeb8d6787f --- src/kits/tracker/FSUtils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp index 1568c79720..81b5434be7 100644 --- a/src/kits/tracker/FSUtils.cpp +++ b/src/kits/tracker/FSUtils.cpp @@ -2416,7 +2416,7 @@ FSMakeOriginalName(char* name, BDirectory* destDir, const char* suffix) strlcpy(root, name, sizeof(root)); // save root name - strlcat(name, suffix, sizeof(name)); + strlcat(name, suffix, B_FILE_NAME_LENGTH - 1); } strlcpy(copybase, name, sizeof(copybase)); @@ -2441,7 +2441,7 @@ FSMakeOriginalName(char* name, BDirectory* destDir, const char* suffix) } ASSERT((strlen(tempName) <= (B_FILE_NAME_LENGTH - 1))); - strlcpy(name, tempName, sizeof(name)); + strcpy(name, tempName); }