TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Tighten change_filename_extension handling of overflow

Browse source
This commit is contained in:
Kp 2022-10-09 23:15:20 +00:00
parent a9142bb65a
commit b0ebe3b82c
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
common/misc/strutil.cpp
View file

@ -135,23 +135,17 @@ void removeext(const char *const filename, std::array<char, 20> &out)
memcpy(out.data(), filename, copy_len);
}
//give a filename a new extension, won't append if strlen(dest) > 8 chars.
void change_filename_extension(const std::span<char> dest, const char *const src, const std::span<const char, 4> ext)
{
char *p;
strcpy(dest.data(), src);
p = strrchr(dest.data(), '.');
if (!p) {
if (strlen(dest.data()) > FILENAME_LEN - 5)
return; // a non-opened file is better than a bad memory access
p = dest.data() + strlen(dest.data());
*p = '.';
const char *const p = strrchr(src, '.');
const std::size_t src_dist_to_last_dot = p ? std::distance(src, p) : strlen(src);
if (src_dist_to_last_dot + 1 + ext.size() > dest.size())
{
dest.front() = 0;
return; // a non-opened file is better than a bad memory access
}
strcpy(p + 1, ext.data());
std::snprintf(dest.data(), dest.size(), "%.*s.%s", static_cast<int>(src_dist_to_last_dot), src, ext.data());
}
splitpath_t d_splitpath(const char *name)