mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-28 12:57:50 +00:00
Code Issues Releases Wiki Activity

Don't pass a NULL submitcwd or ttyname value to the server.

Browse Source 
It is possible for the cwd and/or tty to be missing.  If we send a
NULL pointer to the server where it expects a string the AcceptMessage
will fail to parse.
This commit is contained in:
Todd C. Miller 2020-04-06 07:18:58 -06:00
parent 93f5e1be36
commit e31e0c4d3f
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/sudoers/iolog_client.c
View File

@ -746,10 +746,12 @@ fmt_accept_message(struct client_closure *closure)
accept_msg.info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL; accept_msg.info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL;
n++; n++;
accept_msg.info_msgs[n]->key = "submitcwd"; if (details->cwd != NULL) {
accept_msg.info_msgs[n]->strval = (char *)details->cwd; accept_msg.info_msgs[n]->key = "submitcwd";
accept_msg.info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL; accept_msg.info_msgs[n]->strval = (char *)details->cwd;
n++; accept_msg.info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL;
n++;
}
/* TODO - submitenv */ /* TODO - submitenv */
/* TODO - submitgid */ /* TODO - submitgid */
@ -769,10 +771,12 @@ fmt_accept_message(struct client_closure *closure)
accept_msg.info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL; accept_msg.info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL;
n++; n++;
accept_msg.info_msgs[n]->key = "ttyname"; if (details->tty != NULL) {
accept_msg.info_msgs[n]->strval = (char *)details->tty; accept_msg.info_msgs[n]->key = "ttyname";
accept_msg.info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL; accept_msg.info_msgs[n]->strval = (char *)details->tty;
n++; accept_msg.info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL;
n++;
}
/* Update n_info_msgs. */ /* Update n_info_msgs. */
accept_msg.n_info_msgs = n; accept_msg.n_info_msgs = n;