Merge pull request #873 from Links2004/string_fix

igrr · igrr · commit b478eacef5e2 · 2015-10-17T21:23:28.000+02:00
fix possible free of null in String
diff --git a/cores/esp8266/WString.cpp b/cores/esp8266/WString.cpp
@@ -118,7 +118,9 @@ ICACHE_FLASH_ATTR String::String(double value, unsigned char decimalPlaces) {
 }
 
 ICACHE_FLASH_ATTR String::~String() {
-    free(buffer);
+    if(buffer) {
+        free(buffer);
+    }
 }
 
 // /*********************************************/

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,9 @@ ICACHE_FLASH_ATTR String::String(double value, unsigned char decimalPlaces) {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`ICACHE_FLASH_ATTR String::~String() {`
`121`		`- free(buffer);`
	`121`	`+ if(buffer) {`
	`122`	`+ free(buffer);`
	`123`	`+ }`
`122`	`124`	`}`
`123`	`125`
`124`	`126`	`// /*********************************************/`