Skip to content
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.

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

StreamString SSO bug #6035

Merged
merged 27 commits into from
May 2, 2019
Merged
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e3829d9
Git ignore
Sep 26, 2018
83d745b
Merge branch 'master' of https://github.com/esp8266/Arduino
Oct 28, 2018
bf8f504
Merge branch 'master' of https://github.com/esp8266/Arduino
Jan 11, 2019
b424ed9
Merge branch 'master' of https://github.com/esp8266/Arduino
Jan 16, 2019
57221b7
Merge branch 'master' of https://github.com/esp8266/Arduino
Jan 18, 2019
6ff3806
Merge branch 'master' of https://github.com/esp8266/Arduino
Jan 19, 2019
cfe518a
Merge branch 'master' of https://github.com/mongozmaki/Arduino
Jan 27, 2019
9ad3a47
Merge branch 'master' of https://github.com/esp8266/Arduino
Jan 29, 2019
8069134
Merge branch 'master' of https://github.com/esp8266/Arduino
Feb 2, 2019
1266844
Merge branch 'master' of https://github.com/esp8266/Arduino
Feb 16, 2019
cb9a94f
Merge branch 'master' of https://github.com/esp8266/Arduino
Feb 24, 2019
266177c
Merge branch 'master' of https://github.com/esp8266/Arduino
Feb 26, 2019
ffeb886
Merge branch 'master' of https://github.com/esp8266/Arduino
Feb 28, 2019
871ea5f
Merge branch 'master' of https://github.com/esp8266/Arduino
Mar 2, 2019
0eee3e2
Merge branch 'master' of https://github.com/esp8266/Arduino
Mar 2, 2019
50da037
Merge branch 'master' of https://github.com/esp8266/Arduino
Mar 31, 2019
df99b9b
Merge branch 'master' of https://github.com/esp8266/Arduino
Apr 5, 2019
28476c8
Merge branch 'master' of https://github.com/esp8266/Arduino
Apr 6, 2019
04daaa0
Merge branch 'master' of https://github.com/esp8266/Arduino
Apr 22, 2019
445d9db
Merge branch 'master' of https://github.com/esp8266/Arduino
Apr 23, 2019
a34118a
Merge branch 'master' of https://github.com/esp8266/Arduino
Apr 24, 2019
c61f226
Merge branch 'master' of https://github.com/esp8266/Arduino
May 1, 2019
1e0e783
Merge branch 'master' of https://github.com/esp8266/Arduino
May 1, 2019
c4ac0c7
- StreamString fix
May 1, 2019
a656c4d
Remove changes to gitignore
earlephilhower May 2, 2019
aa80874
Merge branch 'master' into fix/StreamString
earlephilhower May 2, 2019
c80822a
Fix missing space for 0-terminator lost in conversion
earlephilhower May 2, 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
7 changes: 4 additions & 3 deletions cores/esp8266/StreamString.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@

size_t StreamString::write(const uint8_t *data, size_t size) {
if(size && data) {
if(reserve(length() + size + 1)) {
const unsigned int newlen = length() + size;
if(reserve(newlen + 1)) {
memcpy((void *) (wbuffer() + len()), (const void *) data, size);
setLen(len() + size);
*(wbuffer() + len()) = 0x00; // add null for string end
setLen(newlen);
*(wbuffer() + newlen) = 0x00; // add null for string end
return size;
}
}
Expand Down