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

Silence a clang analyzer false positive.

Browse Source
This commit is contained in:
Todd C. Miller
2021-02-08 16:06:08 -07:00
parent 722759d0b9
commit 3d55bca8ac
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/sudoers/toke_util.c
View File

@@ -187,16 +187,14 @@ fill_args(const char *s, size_t len, int addspace)
/* Allocate in increments of 128 bytes to avoid excessive realloc(). */
arg_size = (new_len + 1 + 127) & ~127;
parser_leak_remove(LEAK_PTR, sudoerslval.command.args);
p = realloc(sudoerslval.command.args, arg_size);
if (p == NULL) {
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
goto bad;
}
if (sudoerslval.command.args != p) {
parser_leak_remove(LEAK_PTR, sudoerslval.command.args);
parser_leak_add(LEAK_PTR, p);
sudoerslval.command.args = p;
}
parser_leak_add(LEAK_PTR, p);
sudoerslval.command.args = p;
}
/* Efficiently append the arg (with a leading space if needed). */
@@ -206,13 +204,13 @@ fill_args(const char *s, size_t len, int addspace)
len = arg_size - (p - sudoerslval.command.args);
if (strlcpy(p, s, len) >= len) {
sudo_warnx(U_("internal error, %s overflow"), __func__);
parser_leak_remove(LEAK_PTR, sudoerslval.command.args);
goto bad;
}
arg_len = new_len;
debug_return_bool(true);
bad:
sudoerserror(NULL);
parser_leak_remove(LEAK_PTR, sudoerslval.command.args);
free(sudoerslval.command.args);
sudoerslval.command.args = NULL;
arg_len = arg_size = 0;