alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(console): Fixed linenoise prompt length calculation

Browse Source 
This commit fixes a potential issue where in the prompt length used
for the linenoise based console could be calculated as a negative
integer, leading to a console hang.

Closes https://github.com/espressif/esp-idf/issues/4924
This commit is contained in:
Sudeep Mohanty 2024-01-12 13:43:35 +01:00
parent bb46e6529c
commit bc11b9183b
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -804,6 +804,23 @@ uint32_t getMillis(void) {
return tv.tv_sec * 1000 + tv.tv_usec / 1000;
}
static inline size_t prompt_len_ignore_escape_seq(const char *prompt) {
size_t plen = 0;
bool in_escape_sequence = false;
for (; *prompt != '\0'; ++prompt) {
if (*prompt == '\033') {
in_escape_sequence = true;
} else if (in_escape_sequence && *prompt == 'm') {
in_escape_sequence = false;
} else if (!in_escape_sequence) {
++plen;
}
}
return plen;
}
/* This function is the core of the line editing capability of linenoise.
* It expects 'fd' to be already in "raw mode" so that every key pressed
* will be returned ASAP to read().
@ -839,15 +856,16 @@ static int linenoiseEdit(char *buf, size_t buflen, const char *prompt)
* initially is just an empty string. */
linenoiseHistoryAdd("");
int pos1 = getCursorPosition();
if (write(out_fd, prompt,l.plen) == -1) {
return -1;
}
flushWrite();
int pos2 = getCursorPosition();
if (pos1 >= 0 && pos2 >= 0) {
l.plen = pos2 - pos1;
}
/* If the prompt has been registered with ANSI escape sequences
* for terminal colors then we remove them from the prompt length
* calculation. */
l.plen = prompt_len_ignore_escape_seq(prompt);
while(1) {
char c;
int nread;