espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 21:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

protocomm_console.c: Fix out of bound read in protocomm_console_task and define line_buf size

Browse Source
This commit is contained in:
kewal shah
2021-04-26 14:31:42 +05:30
committed by bot
parent 74f9ce437f
commit b8dfb27141
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@
#include "protocomm_priv.h" #include "protocomm_priv.h"
#define LINE_BUF_SIZE 256
static const char *TAG = "protocomm_console"; static const char *TAG = "protocomm_console";
static uint32_t session_id = PROTOCOMM_NO_SESSION_ID; static uint32_t session_id = PROTOCOMM_NO_SESSION_ID;
@@ -70,18 +71,18 @@ static bool stopped(void)
static void protocomm_console_task(void *arg) static void protocomm_console_task(void *arg)
{ {
int uart_num = (int) arg; int uart_num = (int) arg;
uint8_t linebuf[256]; uint8_t linebuf[LINE_BUF_SIZE];
int i, cmd_ret; int i, cmd_ret;
esp_err_t ret; esp_err_t ret;
QueueHandle_t uart_queue; QueueHandle_t uart_queue;
uart_event_t event; uart_event_t event;
ESP_LOGD(TAG, "Initializing UART on port %d", uart_num); ESP_LOGD(TAG, "Initializing UART on port %d", uart_num);
uart_driver_install(uart_num, 256, 0, 8, &uart_queue, 0); uart_driver_install(uart_num, LINE_BUF_SIZE, 0, 8, &uart_queue, 0);
/* Initialize the console */ /* Initialize the console */
esp_console_config_t console_config = { esp_console_config_t console_config = {
.max_cmdline_args = 8, .max_cmdline_args = 8,
.max_cmdline_length = 256, .max_cmdline_length = LINE_BUF_SIZE,
}; };
esp_console_init(&console_config); esp_console_init(&console_config);
@@ -101,7 +102,7 @@ static void protocomm_console_task(void *arg)
} }
} }
if (event.type == UART_DATA) { if (event.type == UART_DATA) {
while (uart_read_bytes(uart_num, (uint8_t *) &linebuf[i], 1, 0)) { while (uart_read_bytes(uart_num, (uint8_t *) &linebuf[i], 1, 0) && (i < LINE_BUF_SIZE)) {
if (linebuf[i] == '\r') { if (linebuf[i] == '\r') {
uart_write_bytes(uart_num, "\r\n", 2); uart_write_bytes(uart_num, "\r\n", 2);
} else { } else {
@@ -110,7 +111,10 @@ static void protocomm_console_task(void *arg)
i++; i++;
} }
} }
} while ((i < 255) && linebuf[i-1] != '\r'); if ((i > 0) && (linebuf[i-1] == '\r')) {
break;
}
} while (i < LINE_BUF_SIZE);
if (stopped()) { if (stopped()) {
break; break;
} }