StreamConstPtr: disallow passing a String temporary (#8410)

d-a-v · web-flow · commit dde2c769db6c · 2022-01-03T13:42:27.000+01:00
* StreamConstPtr: prevent from passing a temporary String instance
* unconditionally allow progmem chars
* missing virtual destructor in Stream
(warning: deleting object of abstract class type 'Stream' which has non-virtual destructor will cause undefined behavior [-Wdelete-non-virtual-dtor])
diff --git a/cores/esp8266/Stream.h b/cores/esp8266/Stream.h
@@ -61,6 +61,7 @@ class Stream: public Print {
         virtual int peek() = 0;
 
         Stream() {}
+        virtual ~Stream() {}
 
 // parsing methods
 
diff --git a/cores/esp8266/StreamDev.h b/cores/esp8266/StreamDev.h
@@ -160,6 +160,7 @@ class StreamConstPtr: public StreamNull
     size_t _peekPointer = 0;
 
 public:
+    StreamConstPtr(const String&& string) = delete; // prevents passing String temporary, use ctor(buffer,size) if you know what you are doing
     StreamConstPtr(const String& string): _buffer(string.c_str()), _size(string.length()), _byteAddressable(true) { }
     StreamConstPtr(const char* buffer, size_t size): _buffer(buffer), _size(size), _byteAddressable(__byteAddressable(buffer)) { }
     StreamConstPtr(const uint8_t* buffer, size_t size): _buffer((const char*)buffer), _size(size), _byteAddressable(__byteAddressable(buffer)) { }
diff --git a/cores/esp8266/StreamSend.cpp b/cores/esp8266/StreamSend.cpp
@@ -341,7 +341,7 @@ Stream& operator << (Stream& out, Stream& stream)
 
 Stream& operator << (Stream& out, const char* text)
 {
-    StreamConstPtr(text).sendAll(out);
+    StreamConstPtr(text, strlen_P(text)).sendAll(out);
     return out;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ Stream& operator << (Stream& out, Stream& stream)`
`341`	`341`
`342`	`342`	`Stream& operator << (Stream& out, const char* text)`
`343`	`343`	`{`
`344`		`- StreamConstPtr(text).sendAll(out);`
	`344`	`+ StreamConstPtr(text, strlen_P(text)).sendAll(out);`
`345`	`345`	`return out;`
`346`	`346`	`}`
`347`	`347`