Fix String::clear() not clearing the string properly

me-no-dev · me-no-dev · commit 22a488cf2391 · 2021-03-04T21:20:27.000+02:00
Fixes: espressif#4893
diff --git a/cores/esp32/WString.cpp b/cores/esp32/WString.cpp
@@ -130,9 +130,9 @@ String::~String(){
 
 inline void String::init(void){
 setSSO(false);
+ setBuffer(nullptr);
 setCapacity(0);
 setLen(0);
- setBuffer(nullptr);
 }
 
 void String::invalidate(void){
diff --git a/cores/esp32/WString.h b/cores/esp32/WString.h
@@ -301,9 +301,19 @@ class String{
 inline unsigned int len() const{return isSSO() ? sso.len : ptr.len}
 inline unsigned int capacity() const{return isSSO() ? (unsigned int)SSOSIZE - 1 : ptr.cap} // Size of max string not including terminal NUL
 inline void setSSO(bool set){sso.isSSO = set}
- inline void setLen(int len){if (isSSO()) sso.len = len; else ptr.len = len}
+ inline void setLen(int len){
+ if (isSSO()){
+ sso.len = len;
+ sso.buff[len] = 0;
+ } else{
+ ptr.len = len;
+ if (ptr.buff){
+ ptr.buff[len] = 0;
+ }
+ }
+ }
 inline void setCapacity(int cap){if (!isSSO()) ptr.cap = cap}
-	inline void setBuffer(char *buff){if (!isSSO()) ptr.buff = buff}
+ inline void setBuffer(char *buff){if (!isSSO()) ptr.buff = buff}
 // Buffer accessor functions
 inline const char *buffer() const{return (const char *)(isSSO() ? sso.buff : ptr.buff)}
 inline char *wbuffer() const{return isSSO() ? const_cast<char *>(sso.buff) : ptr.buff} // Writable version of buffer

-Original file line number
+Diff line change
 inlineunsignedintlen() const{returnisSSO() ? sso.len : ptr.len}
 inlineunsignedintcapacity() const{returnisSSO() ? (unsignedint)SSOSIZE - 1 : ptr.cap} // Size of max string not including terminal NUL
 inlinevoidsetSSO(bool set){sso.isSSO = set}
 -inlinevoidsetLen(int len){if (isSSO()) sso.len = len; else ptr.len = len}
 +inlinevoidsetLen(int len){
 +if (isSSO()){
 + sso.len = len;
 + sso.buff[len] = 0;
 + } else{
 + ptr.len = len;
 +if (ptr.buff){
 + ptr.buff[len] = 0;
 + }
 + }
 + }
 inlinevoidsetCapacity(int cap){if (!isSSO()) ptr.cap = cap}
 -inlinevoidsetBuffer(char *buff){if (!isSSO()) ptr.buff = buff}
 +inlinevoidsetBuffer(char *buff){if (!isSSO()) ptr.buff = buff}
 // Buffer accessor functions
 inlineconstchar *buffer() const{return (constchar *)(isSSO() ? sso.buff : ptr.buff)}
 inlinechar *wbuffer() const{returnisSSO() ? const_cast<char *>(sso.buff) : ptr.buff} // Writable version of buffer