Fix to allow more than one certificate to be loaded (#3248). (#4056)

pulquero · Mark Hale · web-flow · commit 11d071b1c8ee · 2020-09-30T15:19:41.000+03:00
Co-authored-by: Mark Hale &lt;mark.hale@physics.org&gt;
diff --git a/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp b/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp
@@ -274,18 +274,16 @@ bool WiFiClientSecure::verify(const char* fp, const char* domain_name)
 }
 
 char *WiFiClientSecure::_streamLoad(Stream& stream, size_t size) {
-  static char *dest = nullptr;
-  if(dest) {
-      free(dest);
-  }
-  dest = (char*)malloc(size);
+  char *dest = (char*)malloc(size+1);
   if (!dest) {
     return nullptr;
   }
   if (size != stream.readBytes(dest, size)) {
     free(dest);
     dest = nullptr;
+    return nullptr;
   }
+  dest[size] = '\0';
   return dest;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -274,18 +274,16 @@ bool WiFiClientSecure::verify(const char* fp, const char* domain_name)`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`char *WiFiClientSecure::_streamLoad(Stream& stream, size_t size) {`
`277`		`- static char *dest = nullptr;`
`278`		`- if(dest) {`
`279`		`- free(dest);`
`280`		`- }`
`281`		`- dest = (char*)malloc(size);`
	`277`	`+ char dest = (char)malloc(size+1);`
`282`	`278`	`if (!dest) {`
`283`	`279`	`return nullptr;`
`284`	`280`	`}`
`285`	`281`	`if (size != stream.readBytes(dest, size)) {`
`286`	`282`	`free(dest);`
`287`	`283`	`dest = nullptr;`
	`284`	`+ return nullptr;`
`288`	`285`	`}`
	`286`	`+ dest[size] = '\0';`
`289`	`287`	`return dest;`
`290`	`288`	`}`
`291`	`289`