Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-02 02:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiutil] Fix UnescapeCString overflow when inputSize < 2 (#4796)

Browse Source 
Add tests for empty, small, and string without escapes.
This commit is contained in:
Ryan Blue
2022-12-11 10:36:38 -05:00
committed by GitHub
parent 4a0ad6b48c
commit a31459bce6
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/StringExtras.cpp vendored
View File

@@ -362,7 +362,7 @@ std::optional<long double> wpi::parse_float<long double>(
std::pair<std::string_view, std::string_view> wpi::UnescapeCString(
std::string_view str, wpi::SmallVectorImpl<char>& buf) {
buf.clear();
buf.reserve(str.size() - 2);
buf.reserve(str.size());
const char* s = str.data();
const char* end = str.data() + str.size();
for (; s != end && *s != '"'; ++s) {

19
wpiutil/src/test/native/cpp/UnescapeCStringTest.cpp
View File

@@ -52,4 +52,23 @@ TEST(UnescapeCStringTest, Octal) {
EXPECT_TRUE(rem.empty());
}
TEST(UnescapeCStringTest, EmptyString) {
SmallString<64> buf;
auto [out, rem] = UnescapeCString("", buf);
EXPECT_EQ(out, "");
}
TEST(UnescapeCStringTest, ShortString) {
SmallString<64> buf;
auto [out, rem] = UnescapeCString("a", buf);
EXPECT_EQ(out, "a");
}
TEST(UnescapeCStringTest, NoEscapesString) {
SmallString<64> buf;
std::string_view input = "abcdefghijklmnopqrstuvwxyz1234567890";
auto [out, rem] = UnescapeCString(input, buf);
EXPECT_EQ(out, input);
}
} // namespace