Skip to content

Commit 87a7f8e

Browse files
committed
Merge pull request #1668 from raheelh/patch-1
Fix a crash in String::changeBuffer()
2 parents 99d351d + fdf8599 commit 87a7f8e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

cores/esp8266/WString.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,11 @@ unsigned char ICACHE_FLASH_ATTR String::changeBuffer(unsigned int maxStrLen) {
156156
char *newbuffer = (char *) malloc(newSize);
157157
if(newbuffer) {
158158
memset(newbuffer, 0, newSize);
159-
memcpy(newbuffer, buffer, len);
160159
if (buffer)
160+
{
161+
memcpy(newbuffer, buffer, len);
161162
free(buffer);
163+
}
162164
capacity = newSize - 1;
163165
buffer = newbuffer;
164166
return 1;

0 commit comments

Comments
 (0)