From d37e23576c8213bee5c48a2d1b8ed8b460069eff Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 20 Oct 2021 21:04:44 -0400 Subject: [PATCH] Tracker: Use strlcpy in FSMakeOriginalName. Suggested by axeld on the mailing list a while back. strlcpy/strlcat NULL-terminate within the passed buffer size, so we have no need to subtract 1 here. --- src/kits/tracker/FSUtils.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp index 81b5434be7..27b5689721 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, B_FILE_NAME_LENGTH - 1); + strlcat(name, suffix, B_FILE_NAME_LENGTH); } strlcpy(copybase, name, sizeof(copybase)); @@ -2440,8 +2440,7 @@ FSMakeOriginalName(char* name, BDirectory* destDir, const char* suffix) } } - ASSERT((strlen(tempName) <= (B_FILE_NAME_LENGTH - 1))); - strcpy(name, tempName); + strlcpy(name, tempName, B_FILE_NAME_LENGTH); }