Skip to content

Avoid copying null in concat, unused + breaks views #8198

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 5 commits into from
Jul 8, 2021
Merged

Avoid copying null in concat, unused + breaks views #8198

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
44b8c1f
Avoid copying null in concat, unused + breaks views
paulocsanz Jul 7, 2021
f6a4cd1
Add concat OOB test case
paulocsanz Jul 8, 2021
d11e1a8
Merge branch 'master' into fix/string-concat
paulocsanz Jul 8, 2021
d0f6fcd
Free memory in test
paulocsanz Jul 8, 2021
e704cd0
Merge branch 'master' into fix/string-concat
earlephilhower Jul 8, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cores/esp8266/WString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ bool String::concat(const char *cstr, unsigned int length) {
return true;
if (!reserve(newlen))
return false;
memmove_P(wbuffer() + len(), cstr, length + 1);
memmove_P(wbuffer() + len(), cstr, length);
setLen(newlen);
wbuffer()[newlen] = 0;
return true;
Expand Down
9 changes: 9 additions & 0 deletions tests/host/core/test_string.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,3 +594,12 @@ TEST_CASE("String chaining", "[core][String]")
REQUIRE(static_cast<const void*>(result.c_str()) == static_cast<const void*>(ptr));
}
}

TEST_CASE("String concat OOB #8198", "[core][String]")
{
char *p = (char*)malloc(16);
memset(p, 'x', 16);
String s = "abcd";
s.concat(p, 16);
REQUIRE(!strcmp(s.c_str(), "abcdxxxxxxxxxxxxxxxx"));
}