From e3829d9bea50bf80b14f6c4c01401edd28bdb6bb Mon Sep 17 00:00:00 2001 From: Harald Frostel Date: Wed, 26 Sep 2018 13:36:45 +0200 Subject: [PATCH 1/4] Git ignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index c327116cf1..4f3e76ca67 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,6 @@ boards.local.txt *.gcda *.o *.a + +*.vcxitems +vs-readme.txt From c4ac0c742f9f96e7d25a0928a1e7a6fb6869b633 Mon Sep 17 00:00:00 2001 From: Harald Frostel Date: Thu, 2 May 2019 01:20:49 +0200 Subject: [PATCH 2/4] - StreamString fix --- cores/esp8266/StreamString.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cores/esp8266/StreamString.cpp b/cores/esp8266/StreamString.cpp index bb99232236..d7a1ab0b59 100644 --- a/cores/esp8266/StreamString.cpp +++ b/cores/esp8266/StreamString.cpp @@ -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)) { 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; } } From a656c4dadc210885fdaddd0ca080e2f14588f8e4 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Thu, 2 May 2019 08:46:04 -0700 Subject: [PATCH 3/4] Remove changes to gitignore --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9873da9298..da62e65e21 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,3 @@ boards.local.txt *.gcda *.o *.a - -*.vcxitems -vs-readme.txt From c80822ad5177abb260838fca8cf0414521809ec8 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Thu, 2 May 2019 09:11:49 -0700 Subject: [PATCH 4/4] Fix missing space for 0-terminator lost in conversion --- cores/esp8266/StreamString.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/esp8266/StreamString.cpp b/cores/esp8266/StreamString.cpp index d7a1ab0b59..f50b6825b5 100644 --- a/cores/esp8266/StreamString.cpp +++ b/cores/esp8266/StreamString.cpp @@ -26,7 +26,7 @@ size_t StreamString::write(const uint8_t *data, size_t size) { if(size && data) { const unsigned int newlen = length() + size; - if(reserve(newlen)) { + if(reserve(newlen + 1)) { memcpy((void *) (wbuffer() + len()), (const void *) data, size); setLen(newlen); *(wbuffer() + newlen) = 0x00; // add null for string end