[NFC][sanitizer] Add InternalScopedString::Append (#66559)

This commit is contained in:
Vitaly Buka 2023-09-15 22:40:08 -07:00 committed by GitHub
parent 1b65b159da
commit 591266c56c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 1 deletions

View File

@ -643,6 +643,7 @@ class InternalScopedString {
buffer_.resize(1);
buffer_[0] = '\0';
}
void Append(const char *str);
void AppendF(const char *format, ...) FORMAT(2, 3);
const char *data() const { return buffer_.data(); }
char *data() { return buffer_.data(); }

View File

@ -337,6 +337,15 @@ int internal_snprintf(char *buffer, uptr length, const char *format, ...) {
return needed_length;
}
void InternalScopedString::Append(const char *str) {
if (!str) // For consistency with AppendF("%s", str) which accepts nullptr.
return;
uptr prev_len = length();
uptr str_len = internal_strlen(str);
buffer_.resize(prev_len + str_len + 1);
internal_memcpy(buffer_.data() + prev_len, str, str_len + 1);
}
void InternalScopedString::AppendF(const char *format, ...) {
uptr prev_len = length();

View File

@ -376,7 +376,33 @@ TEST(SanitizerCommon, RemoveANSIEscapeSequencesFromString) {
}
}
TEST(SanitizerCommon, InternalScopedString) {
TEST(SanitizerCommon, InternalScopedStringAppend) {
InternalScopedString str;
EXPECT_EQ(0U, str.length());
EXPECT_STREQ("", str.data());
str.Append(nullptr);
EXPECT_EQ(0U, str.length());
EXPECT_STREQ("", str.data());
str.Append("");
EXPECT_EQ(0U, str.length());
EXPECT_STREQ("", str.data());
str.Append("foo");
EXPECT_EQ(3U, str.length());
EXPECT_STREQ("foo", str.data());
str.Append("");
EXPECT_EQ(3U, str.length());
EXPECT_STREQ("foo", str.data());
str.Append("123\000456");
EXPECT_EQ(6U, str.length());
EXPECT_STREQ("foo123", str.data());
}
TEST(SanitizerCommon, InternalScopedStringAppendF) {
InternalScopedString str;
EXPECT_EQ(0U, str.length());
EXPECT_STREQ("", str.data());