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

Do variable length arrays the C99 way

Browse Source 
Variable length arrays are supported by C99, but having it denoted as "1" confused the compiler and is not defined.

Note that because we don't get the inferred NULL terminator, we have to increase the malloc size by one.
This commit is contained in:
Rose
2023-05-18 14:49:45 -04:00
parent 64b666471a
commit 7fd680c983
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/sudoers/canon_path.c
View File

@@ -41,12 +41,12 @@ static struct rbtree *canon_cache;
* resolved path. The resolved path is directly embedded into the
* struct so that we can find the start of the struct cache_item
* given the value of resolved. Storage for pathname is embedded
* at the end, after resolved.
* at the end with resolved.
*/
struct cache_item {
unsigned int refcnt;
char *pathname;
char resolved[1]; /* actually bigger */
char resolved[];
};
/*
@@ -150,7 +150,8 @@ canon_path(const char *inpath)
resolved = realpath(inpath, resbuf);
inlen = strlen(inpath);
item_size = sizeof(*item) + inlen + 1;
/* one for NULL terminator of resolved, one for NULL terminator of pathname */
item_size = sizeof(*item) + inlen + 2;
if (resolved != NULL) {
reslen = strlen(resolved);
item_size += reslen;