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

expand_include: initialize dst_size to 1 to quiet coverity warning

Browse Source 
This could only be an issue if the sudoers file was an empty string,
which is not possible.
This commit is contained in:
Todd C. Miller 2025-01-14 13:25:59 -07:00
parent 34a3c84de1
commit af4634a1c1
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/sudoers/toke.c
View File

@ -3262,7 +3262,7 @@ char *yytext;
/* /*
* SPDX-License-Identifier: ISC * SPDX-License-Identifier: ISC
* *
* Copyright (c) 1996, 1998-2005, 2007-2024 * Copyright (c) 1996, 1998-2005, 2007-2025
* Todd C. Miller <Todd.Miller@sudo.ws> * Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -5982,14 +5982,15 @@ expand_include(const char *src, const char *host)
* If the current sudoers file was opened via a colon-separated path, * If the current sudoers file was opened via a colon-separated path,
* use the same path when opening src. * use the same path when opening src.
*/ */
dst_size = 0; dst_size = 1;
for (cp = sudo_strsplit(path, path_end, ":", &ep); cp != NULL; for (cp = sudo_strsplit(path, path_end, ":", &ep); cp != NULL;
cp = sudo_strsplit(NULL, path_end, ":", &ep)) { cp = sudo_strsplit(NULL, path_end, ":", &ep)) {
char *dirend = memrchr(cp, '/', (size_t)(ep - cp)); char *dirend = memrchr(cp, '/', (size_t)(ep - cp));
if (dirend != NULL) { if (dirend != NULL) {
/* Include space for trailing '/' separator. */
dst_size += (size_t)(dirend - cp) + 1; dst_size += (size_t)(dirend - cp) + 1;
} }
/* Includes space for ':' separator and NUL terminator. */ /* Includes space for expanded host and ':' separator. */
dst_size += src_len + (nhost * strlen(host)) - (nhost * 2) + 1; dst_size += src_len + (nhost * strlen(host)) - (nhost * 2) + 1;
} }

7
plugins/sudoers/toke.l
View File

@ -2,7 +2,7 @@
/* /*
* SPDX-License-Identifier: ISC * SPDX-License-Identifier: ISC
* *
* Copyright (c) 1996, 1998-2005, 2007-2024 * Copyright (c) 1996, 1998-2005, 2007-2025
* Todd C. Miller <Todd.Miller@sudo.ws> * Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -1203,14 +1203,15 @@ expand_include(const char *src, const char *host)
* If the current sudoers file was opened via a colon-separated path, * If the current sudoers file was opened via a colon-separated path,
* use the same path when opening src. * use the same path when opening src.
*/ */
dst_size = 0; dst_size = 1;
for (cp = sudo_strsplit(path, path_end, ":", &ep); cp != NULL; for (cp = sudo_strsplit(path, path_end, ":", &ep); cp != NULL;
cp = sudo_strsplit(NULL, path_end, ":", &ep)) { cp = sudo_strsplit(NULL, path_end, ":", &ep)) {
char *dirend = memrchr(cp, '/', (size_t)(ep - cp)); char *dirend = memrchr(cp, '/', (size_t)(ep - cp));
if (dirend != NULL) { if (dirend != NULL) {
/* Include space for trailing '/' separator. */
dst_size += (size_t)(dirend - cp) + 1; dst_size += (size_t)(dirend - cp) + 1;
} }
/* Includes space for ':' separator and NUL terminator. */ /* Includes space for expanded host and ':' separator. */
dst_size += src_len + (nhost * strlen(host)) - (nhost * 2) + 1; dst_size += src_len + (nhost * strlen(host)) - (nhost * 2) + 1;
} }