arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-23 19:21:59 +03:00
Code Activity

Merge pull request #1668 from raheelh/patch-1

Browse Source 
Fix a crash in String::changeBuffer()
This commit is contained in:
Ivan Grokhotkov
2016-02-27 01:51:05 +03:00
parent 99d351d661 fdf8599aaa
commit 87a7f8e954
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cores/esp8266/WString.cpp
View File

@ -156,9 +156,11 @@ unsigned char ICACHE_FLASH_ATTR String::changeBuffer(unsigned int maxStrLen) {
char *newbuffer = (char *) malloc(newSize); char *newbuffer = (char *) malloc(newSize);
if(newbuffer) { if(newbuffer) {
memset(newbuffer, 0, newSize); memset(newbuffer, 0, newSize);
memcpy(newbuffer, buffer, len);
if (buffer) if (buffer)
{
memcpy(newbuffer, buffer, len);
free(buffer); free(buffer);
}
capacity = newSize - 1; capacity = newSize - 1;
buffer = newbuffer; buffer = newbuffer;
return 1; return 1;