Merge branch 'fix/coredump_uart_checksum_error_v5.4' into 'release/v5.4'

gerekon · gerekon · commit 72de7111cc23 · 2025-04-11T20:54:14.000+08:00
Fix/coredump uart checksum error (v5.4)

See merge request espressif/esp-idf!38364
diff --git a/components/espcoredump/src/core_dump_uart.c b/components/espcoredump/src/core_dump_uart.c
@@ -120,14 +120,14 @@ static esp_err_t esp_core_dump_uart_write_data(core_dump_write_data_t *wr_data,
         /* Copy to stack to avoid alignment restrictions. */
         char *tmp = buf + (sizeof(buf) - len);
         memcpy(tmp, addr, len);
+        esp_core_dump_checksum_update(&wr_data->checksum_ctx, tmp, len);
         esp_core_dump_b64_encode((const uint8_t *)tmp, len, (uint8_t *)buf);
         addr += len;
         ESP_COREDUMP_PRINT("%s\r\n", buf);
     }
 
     if (wr_data) {
         wr_data->off += data_len;
-        esp_core_dump_checksum_update(&wr_data->checksum_ctx, data, data_len);
     }
     return err;
 }

Original file line number	Diff line number	Diff line change
`@@ -120,14 +120,14 @@ static esp_err_t esp_core_dump_uart_write_data(core_dump_write_data_t *wr_data,`
`120`	`120`	`/* Copy to stack to avoid alignment restrictions. */`
`121`	`121`	`char *tmp = buf + (sizeof(buf) - len);`
`122`	`122`	`memcpy(tmp, addr, len);`
	`123`	`+ esp_core_dump_checksum_update(&wr_data->checksum_ctx, tmp, len);`
`123`	`124`	`esp_core_dump_b64_encode((const uint8_t )tmp, len, (uint8_t )buf);`
`124`	`125`	`addr += len;`
`125`	`126`	`ESP_COREDUMP_PRINT("%s\r\n", buf);`
`126`	`127`	`}`
`127`	`128`
`128`	`129`	`if (wr_data) {`
`129`	`130`	`wr_data->off += data_len;`
`130`		`- esp_core_dump_checksum_update(&wr_data->checksum_ctx, data, data_len);`
`131`	`131`	`}`
`132`	`132`	`return err;`
`133`	`133`	`}`