Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'contrib/github_pr_18641_v6.0' into 'release/v6.0'

Browse Source 
fix(protocomm): prevent out-of-bounds write in console line buffer (GitHub PR) (v6.0)

See merge request espressif/esp-idf!49343
This commit is contained in:
Mahavir Jain
2026-06-29 11:18:08 +05:30
parent 7292d67dd6 980de66b85
commit 3807632d83
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/protocomm/src/transports/protocomm_console.c
View File

@@ -94,7 +94,7 @@ static void protocomm_console_task(void *arg)
}
}
if (event.type == UART_DATA) {
while (uart_read_bytes(uart_num, (uint8_t *) &linebuf[i], 1, 0) && (i < LINE_BUF_SIZE)) {
while ((i < LINE_BUF_SIZE - 1) && uart_read_bytes(uart_num, (uint8_t *) &linebuf[i], 1, 0)) {
if (linebuf[i] == '\r') {
uart_write_bytes(uart_num, "\r\n", 2);
} else {
@@ -106,7 +106,7 @@ static void protocomm_console_task(void *arg)
if ((i > 0) && (linebuf[i-1] == '\r')) {
break;
}
} while (i < LINE_BUF_SIZE);
} while (i < LINE_BUF_SIZE - 1);
if (stopped()) {
break;
}