isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use non-exiting allocatings in the sudoers plugin.

Browse Source
This commit is contained in:
Todd C. Miller
2015-06-17 06:49:59 -06:00
parent 6da04821d7
commit d004b02fc6
36 changed files with 1073 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/sudoers/prompt.c
View File

@@ -96,8 +96,12 @@ expand_prompt(const char *old_prompt, const char *auth_user)
}
}
if ((new_prompt = malloc(++len)) == NULL) {
sudo_warnx(U_("unable to allocate memory"));
debug_return_str(NULL);
}
if (subst) {
new_prompt = sudo_emalloc(++len);
endp = new_prompt + len;
for (p = old_prompt, np = new_prompt; *p; p++) {
if (p[0] =='%') {
@@ -151,13 +155,16 @@ expand_prompt(const char *old_prompt, const char *auth_user)
goto oflow;
}
*np = '\0';
} else
new_prompt = sudo_estrdup(old_prompt);
} else {
/* Nothing to expand. */
memcpy(new_prompt, old_prompt, len); /* len includes NUL */
}
debug_return_str(new_prompt);
oflow:
/* We pre-allocate enough space, so this should never happen. */
free(new_prompt);
sudo_warnx(U_("internal error, %s overflow"), __func__);
debug_return_str(NULL);
}