Skip to content
Merged
Changes from 1 commit
Commits
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
Next Next commit
Avoid reading past end of non-zero terminated char arrays
  • Loading branch information
paulocsanz committed Jun 12, 2022
commit a9cc20a4a47bc3b94bb5743e5a48cbfc8b0e3de8
9 changes: 6 additions & 3 deletions cores/esp8266/WString.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ String &String::copy(const char *cstr, unsigned int length) {
return *this;
}
setLen(length);
memmove_P(wbuffer(), cstr, length + 1);
memmove_P(wbuffer(), cstr, length);
wbuffer()[length] = 0;
return *this;
}

Expand All @@ -270,7 +271,8 @@ String &String::copy(const __FlashStringHelper *pstr, unsigned int length) {
return *this;
}
setLen(length);
memcpy_P(wbuffer(), (PGM_P)pstr, length + 1); // We know wbuffer() cannot ever be in PROGMEM, so memcpy safe here
memcpy_P(wbuffer(), (PGM_P)pstr, length); // We know wbuffer() cannot ever be in PROGMEM, so memcpy safe here
wbuffer()[length] = 0;
return *this;
}

Expand Down Expand Up @@ -411,8 +413,9 @@ bool String::concat(const __FlashStringHelper *str) {
unsigned int newlen = len() + length;
if (!reserve(newlen))
return false;
memcpy_P(wbuffer() + len(), (PGM_P)str, length + 1);
memcpy_P(wbuffer() + len(), (PGM_P)str, length);
setLen(newlen);
wbuffer()[newlen] = 0;
return true;
}

Expand Down