StringUtil: Fix buffer overflow in BytePatternSearch()

Also fixes searching at the final valid offset and underflow when the
pattern length exceeds the input length.
wip3-rebase
Stenzek 3 days ago
parent 187ad8f008
commit bce5e3ddce
No known key found for this signature in database

@ -1030,6 +1030,15 @@ TEST(StringUtil, BytePatternSearch)
result = StringUtil::BytePatternSearch(std::span<const u8>(data), "01 ?? 03"); result = StringUtil::BytePatternSearch(std::span<const u8>(data), "01 ?? 03");
ASSERT_TRUE(result.has_value()); ASSERT_TRUE(result.has_value());
ASSERT_EQ(result.value(), 0u); ASSERT_EQ(result.value(), 0u);
// Test a match at the final valid offset.
result = StringUtil::BytePatternSearch(std::span<const u8>(data), "06 07 08");
ASSERT_TRUE(result.has_value());
ASSERT_EQ(result.value(), 5u);
// Test a pattern longer than the input.
result = StringUtil::BytePatternSearch(std::span<const u8>(data), "01 02 03 04 05 06 07 08 09");
ASSERT_FALSE(result.has_value());
} }
TEST(StringUtil, StrideMemCpy) TEST(StringUtil, StrideMemCpy)

@ -1100,6 +1100,8 @@ std::optional<size_t> StringUtil::BytePatternSearch(const std::span<const u8> by
} }
if (pattern_length == 0) if (pattern_length == 0)
return std::nullopt; return std::nullopt;
if (pattern_length > bytes.size())
return std::nullopt;
const bool allocate_on_heap = (pattern_length >= 512); const bool allocate_on_heap = (pattern_length >= 512);
u8* match_bytes = allocate_on_heap ? new u8[pattern_length * 2] : static_cast<u8*>(alloca(pattern_length * 2)); u8* match_bytes = allocate_on_heap ? new u8[pattern_length * 2] : static_cast<u8*>(alloca(pattern_length * 2));
@ -1143,7 +1145,7 @@ std::optional<size_t> StringUtil::BytePatternSearch(const std::span<const u8> by
std::optional<size_t> ret; std::optional<size_t> ret;
const size_t max_search_offset = bytes.size() - pattern_length; const size_t max_search_offset = bytes.size() - pattern_length;
for (size_t offset = 0; offset < max_search_offset; offset++) for (size_t offset = 0; offset <= max_search_offset; offset++)
{ {
const u8* start = bytes.data() + offset; const u8* start = bytes.data() + offset;
for (size_t match_offset = 0;;) for (size_t match_offset = 0;;)
@ -1154,8 +1156,8 @@ std::optional<size_t> StringUtil::BytePatternSearch(const std::span<const u8> by
match_offset++; match_offset++;
if (match_offset == pattern_length) if (match_offset == pattern_length)
{ {
// found it!
ret = offset; ret = offset;
break;
} }
} }
} }

Loading…
Cancel
Save