mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-01 14:55:12 +00:00
Code Issues Releases Wiki Activity

It's safe to rely on C89 semantics for realloc(NULL, size).

Browse Source
This commit is contained in:
Todd C. Miller
2015-06-20 19:27:31 -06:00
parent 887a76489a
commit d7224ea502
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/util/getline.c
View File

@@ -45,7 +45,7 @@ sudo_getline(char **bufp, size_t *bufsizep, FILE *fp)
bufsize = *bufp ? *bufsizep : 0; bufsize = *bufp ? *bufsizep : 0;
if (bufsize == 0 || bufsize - 1 < len) { if (bufsize == 0 || bufsize - 1 < len) {
bufsize = len + 1; bufsize = len + 1;
cp = *bufp ? realloc(*bufp, bufsize) : malloc(bufsize); cp = realloc(*bufp, bufsize);
if (cp == NULL) if (cp == NULL)
return -1; return -1;
*bufp = cp; *bufp = cp;
@@ -68,7 +68,7 @@ sudo_getline(char **bufp, size_t *bufsizep, FILE *fp)
bufsize = *bufsizep; bufsize = *bufsizep;
if (buf == NULL || bufsize == 0) { if (buf == NULL || bufsize == 0) {
bufsize = LINE_MAX; bufsize = LINE_MAX;
cp = buf ? realloc(buf, bufsize) : malloc(bufsize); cp = realloc(buf, bufsize);
if (cp == NULL) if (cp == NULL)
return -1; return -1;
buf = cp; buf = cp;

5
plugins/sudoers/toke_util.c
View File

@@ -142,10 +142,9 @@ fill_args(const char *s, int len, int addspace)
if (new_len >= arg_size) { if (new_len >= arg_size) {
/* Allocate more space than we need for subsequent args */ /* Allocate more space than we need for subsequent args */
while (new_len >= (arg_size += COMMANDARGINC)) while (new_len >= (arg_size += COMMANDARGINC))
; continue;
p = sudoerslval.command.args ? p = realloc(sudoerslval.command.args, arg_size);
realloc(sudoerslval.command.args, arg_size) : malloc(arg_size);
if (p == NULL) { if (p == NULL) {
free(sudoerslval.command.args); free(sudoerslval.command.args);
sudo_warn(NULL); sudo_warn(NULL);