sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't infinite loop when searching CLI history list (#2560) 

- The easiest way to clean up the history list when moving an item is to just remove it and reinsert, so use pj_list_erase().
- Also in inserting entry to CLI history list (`insert_history()`): trim string before compare (as history entries are trimmed), replace pj_list_insert_nodes_after() with pj_list_erase(), avoid buffer overflow in string copy, and a bit optimization: only copy string when needed.
This commit is contained in:
Sean Bright 2020-12-10 01:48:14 -05:00 committed by GitHub
parent 2eea0ace2b
commit 86f3ea6059
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pjlib-util/src/pjlib-util/cli_telnet.c
View File

@ -385,14 +385,14 @@ static pj_status_t insert_history(cli_telnet_sess *sess,
{
cmd_history *in_history;
pj_str_t cmd;
cmd.ptr = cmd_val;
cmd.slen = pj_ansi_strlen(cmd_val)-1;
if (cmd.slen == 0)
return PJ_SUCCESS;
PJ_ASSERT_RETURN(sess, PJ_EINVAL);
cmd = pj_str(cmd_val);
pj_strtrim(&cmd);
if (cmd.slen == 0)
return PJ_SUCCESS;
/* Find matching history */
in_history = pj_list_search(sess->history, (void*)&cmd, compare_str);
if (!in_history) {
@ -407,11 +407,12 @@ static pj_status_t insert_history(cli_telnet_sess *sess,
} else {
/* Get the oldest history */
in_history = sess->history->prev;
pj_list_erase(in_history);
}
pj_strncpy(&in_history->command, &cmd, PJ_CLI_MAX_CMDBUF);
} else {
pj_list_insert_nodes_after(in_history->prev, in_history->next);
pj_list_erase(in_history);
}
pj_strcpy(&in_history->command, pj_strtrim(&cmd));
pj_list_push_front(sess->history, in_history);
sess->active_history = sess->history;