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

iolog_parse_json_object: optimize for large argv

Browse Source
This commit is contained in:
Todd C. Miller 2021-10-01 08:44:52 -06:00
parent c5f983c643
commit 3575e995a9
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/iolog/iolog_json.c
View File

@ -491,31 +491,41 @@ iolog_parse_json_object(struct json_object *object, struct eventlog *evlog)
/* Merge cmd and argv as sudoreplay expects. */ /* Merge cmd and argv as sudoreplay expects. */
if (evlog->command != NULL && evlog->argv != NULL && evlog->argv[0] != NULL) { if (evlog->command != NULL && evlog->argv != NULL && evlog->argv[0] != NULL) {
size_t len = strlen(evlog->command) + 1; size_t len, bufsize = strlen(evlog->command) + 1;
char *newcmd; char *cp, *buf;
int ac; int ac;
/* Skip argv[0], we use evlog->command instead. */ /* Skip argv[0], we use evlog->command instead. */
for (ac = 1; evlog->argv[ac] != NULL; ac++) for (ac = 1; evlog->argv[ac] != NULL; ac++)
len += strlen(evlog->argv[ac]) + 1; bufsize += strlen(evlog->argv[ac]) + 1;
if ((newcmd = malloc(len)) == NULL) { if ((buf = malloc(bufsize)) == NULL) {
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory")); sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
goto done; goto done;
} }
cp = buf;
/* TODO: optimize this. */ len = strlcpy(cp, evlog->command, bufsize);
if (strlcpy(newcmd, evlog->command, len) >= len) if (len >= bufsize)
sudo_fatalx(U_("internal error, %s overflow"), __func__); sudo_fatalx(U_("internal error, %s overflow"), __func__);
cp += len;
bufsize -= len;
for (ac = 1; evlog->argv[ac] != NULL; ac++) { for (ac = 1; evlog->argv[ac] != NULL; ac++) {
if (strlcat(newcmd, " ", len) >= len) if (bufsize < 2)
sudo_fatalx(U_("internal error, %s overflow"), __func__); sudo_fatalx(U_("internal error, %s overflow"), __func__);
if (strlcat(newcmd, evlog->argv[ac], len) >= len) *cp++ = ' ';
bufsize--;
len = strlcpy(cp, evlog->argv[ac], bufsize);
if (len >= bufsize)
sudo_fatalx(U_("internal error, %s overflow"), __func__); sudo_fatalx(U_("internal error, %s overflow"), __func__);
cp += len;
bufsize -= len;
} }
free(evlog->command); free(evlog->command);
evlog->command = newcmd; evlog->command = buf;
} }
ret = true; ret = true;