RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 12:12:50 +01:00
Code Issues Releases Wiki Activity

StrUtil.h: Prevent an overflow in strcpy_trunc

Browse Source
This commit is contained in:
Elad Ashkenazi 2022-12-17 20:21:54 +02:00 committed by Megamouse
parent 04fb86556a
commit baa2768a69
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Utilities/StrUtil.h
View File

@ -16,7 +16,7 @@ std::string utf16_to_utf8(std::u16string_view src);
template <typename D, typename T> template <typename D, typename T>
inline void strcpy_trunc(D& dst, const T& src) inline void strcpy_trunc(D& dst, const T& src)
{ {
const usz count = std::size(src) >= std::size(dst) ? std::size(dst) - 1 : std::size(src); const usz count = std::size(src) >= std::size(dst) ? std::max<usz>(std::size(dst), 1) - 1 : std::size(src);
std::memcpy(std::data(dst), std::data(src), count); std::memcpy(std::data(dst), std::data(src), count);
std::memset(std::data(dst) + count, 0, std::size(dst) - count); std::memset(std::data(dst) + count, 0, std::size(dst) - count);
} }