Skip to content

Fix RTCmem example buffer access past end #4288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devyte merged 3 commits into from
Feb 6, 2018
Merged

Fix RTCmem example buffer access past end #4288

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17f3220
Fix RTCmem example buffer access past end
devyte Feb 4, 2018
f7d331a
Merge branch 'master' into issue4269
devyte Feb 6, 2018
1a89266
Merge branch 'master' into issue4269
devyte Feb 6, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions libraries/esp8266/examples/RTCUserMemory/RTCUserMemory.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ void setup() {
Serial.println("Read: ");
printMemory();
Serial.println();
uint32_t crcOfData = calculateCRC32(((uint8_t*) &rtcData) + 4, sizeof(rtcData) - 4);
uint32_t crcOfData = calculateCRC32( (uint8_t*) &rtcData.data[0], sizeof(rtcData.data) );
Serial.print("CRC32 of data: ");
Serial.println(crcOfData, HEX);
Serial.print("CRC32 read from RTC: ");
Expand All @@ -52,11 +52,11 @@ void setup() {
}

// Generate new data set for the struct
for (int i = 0; i < sizeof(rtcData); i++) {
for (int i = 0; i < sizeof(rtcData.data); i++) {
rtcData.data[i] = random(0, 128);
}
// Update CRC32 of data
rtcData.crc32 = calculateCRC32(((uint8_t*) &rtcData) + 4, sizeof(rtcData) - 4);
rtcData.crc32 = calculateCRC32( (uint8_t*) &rtcData.data[0], sizeof(rtcData.data) );
// Write struct to RTC memory
if (ESP.rtcUserMemoryWrite(0, (uint32_t*) &rtcData, sizeof(rtcData))) {
Serial.println("Write: ");
Expand Down Expand Up @@ -90,10 +90,12 @@ uint32_t calculateCRC32(const uint8_t *data, size_t length)
return crc;
}

//prints all rtcData, including the leading crc32
void printMemory() {
char buf[3];
uint8_t *ptr = (uint8_t *)&rtcData;
for (int i = 0; i < sizeof(rtcData); i++) {
sprintf(buf, "%02X", rtcData.data[i]);
sprintf(buf, "%02X", ptr[i]);
Serial.print(buf);
if ((i + 1) % 32 == 0) {
Serial.println();
Expand Down