mirrors/make
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/make.git synced 2024-11-24 12:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check for snprintf truncation on W32

Browse source 
* src/main.c (find_and_set_default_shell) [MK_OS_W32]:
Do not use a buffer that snprintf truncated.
This commit is contained in:
Paul Eggert 2024-08-05 01:39:18 -07:00 committed by Paul Smith
parent bba4427b5d
commit 0267eb64fa
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main.c
View file

@ -1080,12 +1080,15 @@ find_and_set_default_shell (const char *token)
while (ep && *ep)
{
int sh_pathlen;
PATH_VAR (sh_path);
*ep = '\0';
snprintf (sh_path, GET_PATH_MAX, "%s/%s", p, search_token);
if (_access (sh_path, 0) == 0)
sh_pathlen = snprintf (sh_path, GET_PATH_MAX, "%s/%s",
p, search_token);
if (0 <= sh_pathlen && sh_pathlen < GET_PATH_MAX
&& _access (sh_path, 0) == 0)
{
default_shell = xstrdup (w32ify (sh_path, 0));
sh_found = 1;
@ -1106,9 +1109,13 @@ find_and_set_default_shell (const char *token)
/* be sure to check last element of Path */
if (p && *p)
{
int sh_pathlen;
PATH_VAR (sh_path);
snprintf (sh_path, GET_PATH_MAX, "%s/%s", p, search_token);
if (_access (sh_path, 0) == 0)
sh_pathlen = snprintf (sh_path, GET_PATH_MAX, "%s/%s",
p, search_token);
if (0 <= sh_pathlen && sh_pathlen < GET_PATH_MAX
&& _access (sh_path, 0) == 0)
{
default_shell = xstrdup (w32ify (sh_path, 0));
sh_found = 1;