Skip to content

Fix String.replace overlapping strcpy #5966

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 4 commits into from
Apr 10, 2019
Merged

Fix String.replace overlapping strcpy #5966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e38e02d
Fix String.replace overlapping strcpy
earlephilhower Apr 10, 2019
c7036a5
Merge branch 'master' into bug5949
earlephilhower Apr 10, 2019
00e2ba7
Additional pathological memcpy->memmove fixes
earlephilhower Apr 10, 2019
962c6ed
Merge branch 'bug5949' of https://github.com./earlephilhower/Arduino i…
earlephilhower Apr 10, 2019
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
12 changes: 6 additions & 6 deletions cores/esp8266/WString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ void String::move(String &rhs) {
}
if (rhs.sso()) {
setSSO(true);
memcpy(sso_buf, rhs.sso_buf, sizeof(sso_buf));
memmove(sso_buf, rhs.sso_buf, sizeof(sso_buf));
} else {
setSSO(false);
setBuffer(rhs.wbuffer());
Expand Down Expand Up @@ -730,21 +730,21 @@ void String::replace(const String& find, const String& replace) {
char *foundAt;
if(diff == 0) {
while((foundAt = strstr(readFrom, find.buffer())) != NULL) {
memcpy(foundAt, replace.buffer(), replace.len());
memmove(foundAt, replace.buffer(), replace.len());
readFrom = foundAt + replace.len();
}
} else if(diff < 0) {
char *writeTo = wbuffer();
while((foundAt = strstr(readFrom, find.buffer())) != NULL) {
unsigned int n = foundAt - readFrom;
memcpy(writeTo, readFrom, n);
memmove(writeTo, readFrom, n);
writeTo += n;
memcpy(writeTo, replace.buffer(), replace.len());
memmove(writeTo, replace.buffer(), replace.len());
writeTo += replace.len();
readFrom = foundAt + find.len();
setLen(len() + diff);
}
strcpy(writeTo, readFrom);
memmove(writeTo, readFrom, strlen(readFrom)+1);
} else {
unsigned int size = len(); // compute size needed for result
while((foundAt = strstr(readFrom, find.buffer())) != NULL) {
Expand All @@ -760,7 +760,7 @@ void String::replace(const String& find, const String& replace) {
readFrom = wbuffer() + index + find.len();
memmove(readFrom + diff, readFrom, len() - (readFrom - buffer()));
int newLen = len() + diff;
memcpy(wbuffer() + index, replace.buffer(), replace.len());
memmove(wbuffer() + index, replace.buffer(), replace.len());
setLen(newLen);
wbuffer()[newLen] = 0;
index--;
Expand Down
12 changes: 12 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 @@ -428,3 +428,15 @@ TEST_CASE("String SSO handles junk in memory", "[core][String]")
REQUIRE(*s == "CO2_defect");
s->~String();
}


TEST_CASE("Issue #5949 - Overlapping src/dest in replace", "[core][String]")
{
String blah = "blah";
blah.replace("xx", "y");
REQUIRE(blah == "blah");
blah.replace("x", "yy");
REQUIRE(blah == "blah");
blah.replace(blah, blah);
REQUIRE(blah == "blah");
}