espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-29 18:27:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/linenoise_unint_buffer_and_color_v4.3' into 'release/v4.3'

Browse Source 
console: linenoise: fix usage of an uninitialized buffer, fix no-color output (v4.3)

See merge request espressif/esp-idf!17830
This commit is contained in:
Mahavir Jain
2022-04-20 21:01:16 +08:00
parent 1ffc02dfaf 5628f1f21d
commit 54d9f265dc
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/console/esp_console_repl.c
View File

@ -368,6 +368,8 @@ static esp_err_t esp_console_common_init(esp_console_repl_com_t *repl_com)
esp_console_config_t console_config = ESP_CONSOLE_CONFIG_DEFAULT();
#if CONFIG_LOG_COLORS
console_config.hint_color = atoi(LOG_COLOR_CYAN);
#else
console_config.hint_color = -1;
#endif
ret = esp_console_init(&console_config);
if (ret != ESP_OK) {

5
components/console/linenoise/linenoise.c
View File

@ -498,9 +498,10 @@ void refreshShowHints(struct abuf *ab, struct linenoiseState *l, int plen) {
int hintmaxlen = l->cols-(plen+l->len);
if (hintlen > hintmaxlen) hintlen = hintmaxlen;
if (bold == 1 && color == -1) color = 37;
if (color != -1 || bold != 0)
if (color != -1 || bold != 0) {
snprintf(seq,64,"\033[%d;%d;49m",bold,color);
abAppend(ab,seq,strlen(seq));
abAppend(ab,seq,strlen(seq));
}
abAppend(ab,hint,hintlen);
if (color != -1 || bold != 0)
abAppend(ab,"\033[0m",4);