Skip to content

TBaseString: Fix possible override #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 26, 2025
Merged

TBaseString: Fix possible override #41

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2618fae
TBaseString: Fix possible override
kullingk Aug 26, 2025
ae55a0c
Fix off-by-one index error
kullingk Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions include/cppcore/Common/TStringBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class TStringBase {

private:
static constexpr size_t InitSize = 512;
T mBuffer[InitSize] = {};
T mBuffer[InitSize] = {'\0'};
T *mStringBuffer{nullptr};
size_t mSize{0};
size_t mCapacity{InitSize};
Expand Down Expand Up @@ -173,11 +173,12 @@ inline void TStringBase<T>::copyFrom(TStringBase<T> &base, const T *ptr, size_t
if (base.mStringBuffer != nullptr) {
delete [] base.mStringBuffer;
}
base.mStringBuffer = new T[size];
base.mCapacity = size;
base.mStringBuffer = new T[size + 1];
base.mCapacity = size + 1;
targetPtr = base.mStringBuffer;
}
memcpy(targetPtr, ptr, size * sizeof(T));
targetPtr[size + 1] = '\0';
base.mSize = size;
}

Expand Down
4 changes: 2 additions & 2 deletions test/common/TStringBaseTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ TEST_F(TStringBaseTest, createTest) {
TEST_F(TStringBaseTest, setResetTest) {
TStringBase<char> string_1;
EXPECT_EQ(string_1.size(), 0);
EXPECT_EQ(string_1.capacity(), 256);
EXPECT_EQ(string_1.capacity(), 512);
string_1.set("test", 4);
EXPECT_EQ(string_1.size(), 4);
EXPECT_EQ(0, strncmp(string_1.c_str(), "test", 4));
Expand All @@ -54,7 +54,7 @@ TEST_F(TStringBaseTest, setResetTest) {

TEST_F(TStringBaseTest, setClearTest) {
TStringBase<char> string_1("test", 4);
EXPECT_EQ(string_1.capacity(), 256);
EXPECT_EQ(string_1.capacity(), 512);
EXPECT_EQ(string_1.size(), 4);
EXPECT_FALSE(string_1.isEmpty());

Expand Down