arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-27 21:16:50 +03:00
Code

wstring: fix concatenation from flash (#6368)

Browse Source 
fixes #6367
This commit is contained in:
david gauchard 2019-08-05 17:16:49 +02:00 committed by Earle F. Philhower, III
parent f78ab66f89
commit 4e9358445a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cores/esp8266/WString.cpp
View File

@ -330,7 +330,12 @@ unsigned char String::concat(const char *cstr, unsigned int length) {
return 1; return 1;
if(!reserve(newlen)) if(!reserve(newlen))
return 0; return 0;
memmove(wbuffer() + len(), cstr, length + 1); if (cstr >= wbuffer() && cstr < wbuffer() + len())
// compatible with SSO in ram #6155 (case "x += x.c_str()")
memmove(wbuffer() + len(), cstr, length + 1);
else
// compatible with source in flash #6367
memcpy_P(wbuffer() + len(), cstr, length + 1);
setLen(newlen); setLen(newlen);
return 1; return 1;
} }