Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 5d00b6e

Browse filesBrowse files
committed
Fix case where EEPROM will try to return longer string than it should
Fixes: espressif#4768
1 parent 419ba32 commit 5d00b6e
Copy full SHA for 5d00b6e

File tree

Expand file treeCollapse file tree

1 file changed

+4
-1
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+4
-1
lines changed

‎libraries/EEPROM/src/EEPROM.cpp

Copy file name to clipboardExpand all lines: libraries/EEPROM/src/EEPROM.cpp
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,9 @@ size_t EEPROMClass::readString (int address, char* value, size_t maxLen)
382382
if (address + len > _size)
383383
return 0;
384384

385+
if (len > maxLen)
386+
return 0; //Maybe return part of the string instead?
387+
385388
memcpy((uint8_t*) value, _data + address, len);
386389
value[len] = 0;
387390
return len;
@@ -400,7 +403,7 @@ String EEPROMClass::readString (int address)
400403
if (address + len > _size)
401404
return String();
402405

403-
char value[len];
406+
char value[len+1];
404407
memcpy((uint8_t*) value, _data + address, len);
405408
value[len] = 0;
406409
return String(value);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.