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

2
include/sudo_event.h
View File

@@ -64,7 +64,7 @@ typedef void (*sudo_ev_callback_t)(int fd, int what, void *closure);
struct sudo_ev_siginfo_container { struct sudo_ev_siginfo_container {
void *closure; void *closure;
siginfo_t *siginfo; siginfo_t *siginfo;
char si_buf[1]; char si_buf[];
}; };
/* Member of struct sudo_event_base. */ /* Member of struct sudo_event_base. */

2
lib/util/event.c
View File

@@ -291,7 +291,7 @@ sudo_ev_set_v1(struct sudo_event *ev, int fd, short events,
/* For SUDO_EV_SIGINFO we use a container to store closure + siginfo_t */ /* For SUDO_EV_SIGINFO we use a container to store closure + siginfo_t */
if (ISSET(events, SUDO_EV_SIGINFO)) { if (ISSET(events, SUDO_EV_SIGINFO)) {
struct sudo_ev_siginfo_container *container = struct sudo_ev_siginfo_container *container =
malloc(sizeof(*container) + sizeof(siginfo_t) - 1); malloc(sizeof(*container) + sizeof(siginfo_t));
if (container == NULL) { if (container == NULL) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"%s: unable to allocate siginfo container", __func__); "%s: unable to allocate siginfo container", __func__);

5
lib/util/rcstr.c
View File

@@ -34,7 +34,7 @@
/* Trivial reference-counted strings. */ /* Trivial reference-counted strings. */
struct rcstr { struct rcstr {
int refcnt; int refcnt;
char str[1]; /* actually bigger */ char str[];
}; };
/* /*
@@ -62,8 +62,7 @@ sudo_rcstr_alloc(size_t len)
struct rcstr *rcs; struct rcstr *rcs;
debug_decl(sudo_rcstr_dup, SUDO_DEBUG_UTIL); debug_decl(sudo_rcstr_dup, SUDO_DEBUG_UTIL);
/* Note: sizeof(struct rcstr) includes space for the NUL */ rcs = malloc(sizeof(struct rcstr) + len + 1);
rcs = malloc(sizeof(struct rcstr) + len);
if (rcs == NULL) if (rcs == NULL)
return NULL; return NULL;

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 * resolved path. The resolved path is directly embedded into the
* struct so that we can find the start of the struct cache_item * struct so that we can find the start of the struct cache_item
* given the value of resolved. Storage for pathname is embedded * given the value of resolved. Storage for pathname is embedded
* at the end, after resolved. * at the end with resolved.
*/ */
struct cache_item { struct cache_item {
unsigned int refcnt; unsigned int refcnt;
char *pathname; char *pathname;
char resolved[1]; /* actually bigger */ char resolved[];
}; };
/* /*
@@ -150,7 +150,8 @@ canon_path(const char *inpath)
resolved = realpath(inpath, resbuf); resolved = realpath(inpath, resbuf);
inlen = strlen(inpath); 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) { if (resolved != NULL) {
reslen = strlen(resolved); reslen = strlen(resolved);
item_size += reslen; item_size += reslen;

2
plugins/sudoers/ldap_conf.c
View File

@@ -452,7 +452,7 @@ sudo_ldap_parse_keyword(const char *keyword, const char *value,
if (len > 0) { if (len > 0) {
head = (struct ldap_config_str_list *)cur->valp; head = (struct ldap_config_str_list *)cur->valp;
if ((str = malloc(sizeof(*str) + len)) == NULL) { if ((str = malloc(sizeof(*str) + len + 1)) == NULL) {
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory")); sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
debug_return_bool(false); debug_return_bool(false);
} }

2
plugins/sudoers/sudo_ldap_conf.h
View File

@@ -44,7 +44,7 @@ struct ldap_config_table {
struct ldap_config_str { struct ldap_config_str {
STAILQ_ENTRY(ldap_config_str) entries; STAILQ_ENTRY(ldap_config_str) entries;
char val[1]; char val[];
}; };
STAILQ_HEAD(ldap_config_str_list, ldap_config_str); STAILQ_HEAD(ldap_config_str_list, ldap_config_str);