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

Avoid passing debug_return_size_t() a negative number.

Browse Source
This commit is contained in:
Todd C. Miller
2023-07-01 10:39:25 -06:00
parent 2a4939a1c5
commit 97e574091a
3 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/sudoers/toke.c
View File

@@ -5,7 +5,7 @@
#include <config.h> #include <config.h>
#line 2 "toke.c" #line 3 "toke.c"
#define YY_INT_ALIGNED short int #define YY_INT_ALIGNED short int
@@ -3346,10 +3346,10 @@ int (*trace_print)(const char *msg) = sudoers_trace_print;
yyless(n); \ yyless(n); \
} while (0); } while (0);
#line 3343 "toke.c" #line 3344 "toke.c"
#define YY_NO_INPUT 1 #define YY_NO_INPUT 1
#line 3346 "toke.c" #line 3347 "toke.c"
#define INITIAL 0 #define INITIAL 0
#define GOTDEFS 1 #define GOTDEFS 1
@@ -3578,7 +3578,7 @@ YY_DECL
{ {
#line 119 "toke.l" #line 119 "toke.l"
#line 3575 "toke.c" #line 3576 "toke.c"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{ {
@@ -4715,7 +4715,7 @@ YY_RULE_SETUP
#line 909 "toke.l" #line 909 "toke.l"
ECHO; ECHO;
YY_BREAK YY_BREAK
#line 4712 "toke.c" #line 4713 "toke.c"
case YY_END_OF_BUFFER: case YY_END_OF_BUFFER:
{ {
@@ -5718,7 +5718,7 @@ pl_compare(const void *v1, const void *v2)
/* /*
* Open dirpath and fill in pathsp with an array of regular files * Open dirpath and fill in pathsp with an array of regular files
* that do not end in '~' or contain a '.'. * that do not end in '~' or contain a '.'.
* Returns the number of files or -1 on error. * Returns the number of files or SIZE_MAX (-1) on error.
* If zero files are found, NULL is stored in pathsp. * If zero files are found, NULL is stored in pathsp.
*/ */
static size_t static size_t
@@ -5817,7 +5817,7 @@ bad:
free(paths[i]); free(paths[i]);
} }
free(paths); free(paths);
debug_return_size_t(-1); debug_return_size_t(SIZE_MAX);
} }
/* /*
@@ -6122,16 +6122,12 @@ push_include_int(const char *opath, bool isdir, int verbose)
debug_return_bool(true); debug_return_bool(true);
} }
count = switch_dir(&istack[idepth], dname, verbose); count = switch_dir(&istack[idepth], dname, verbose);
if (count == 0) { switch (count) {
case SIZE_MAX:
case 0:
/* switch_dir() called sudoerserror() for us */ /* switch_dir() called sudoerserror() for us */
sudo_rcstr_delref(path); sudo_rcstr_delref(path);
debug_return_bool(true); debug_return_bool(count ? false : true);
}
if (count == (size_t)-1) {
/* switch_dir() called sudoerserror() for us */
sudo_rcstr_delref(path);
debug_return_bool(false);
} }
/* Parse the first dir entry we can open, leave the rest for later. */ /* Parse the first dir entry we can open, leave the rest for later. */

16
plugins/sudoers/toke.l
View File

@@ -939,7 +939,7 @@ pl_compare(const void *v1, const void *v2)
/* /*
* Open dirpath and fill in pathsp with an array of regular files * Open dirpath and fill in pathsp with an array of regular files
* that do not end in '~' or contain a '.'. * that do not end in '~' or contain a '.'.
* Returns the number of files or -1 on error. * Returns the number of files or SIZE_MAX (-1) on error.
* If zero files are found, NULL is stored in pathsp. * If zero files are found, NULL is stored in pathsp.
*/ */
static size_t static size_t
@@ -1038,7 +1038,7 @@ bad:
free(paths[i]); free(paths[i]);
} }
free(paths); free(paths);
debug_return_size_t(-1); debug_return_size_t(SIZE_MAX);
} }
/* /*
@@ -1343,16 +1343,12 @@ push_include_int(const char *opath, bool isdir, int verbose)
debug_return_bool(true); debug_return_bool(true);
} }
count = switch_dir(&istack[idepth], dname, verbose); count = switch_dir(&istack[idepth], dname, verbose);
if (count == 0) { switch (count) {
case SIZE_MAX:
case 0:
/* switch_dir() called sudoerserror() for us */ /* switch_dir() called sudoerserror() for us */
sudo_rcstr_delref(path); sudo_rcstr_delref(path);
debug_return_bool(true); debug_return_bool(count ? false : true);
}
if (count == (size_t)-1) {
/* switch_dir() called sudoerserror() for us */
sudo_rcstr_delref(path);
debug_return_bool(false);
} }
/* Parse the first dir entry we can open, leave the rest for later. */ /* Parse the first dir entry we can open, leave the rest for later. */

2
src/limits.c
View File

@@ -710,5 +710,5 @@ serialize_rlimits(char **info, size_t info_max)
oom: oom:
while (nstored) while (nstored)
free(info[--nstored]); free(info[--nstored]);
debug_return_size_t(-1); debug_return_size_t((size_t)-1);
} }