system/doas
system/doas
1
0
Fork 0
mirror of https://github.com/slicer69/doas synced 2024-07-22 10:44:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change realloc() back to reallocarray()

Browse source
This commit is contained in:
Tobias Kortkamp 2016-06-24 13:29:08 +02:00
parent ef6ff75f22
commit 64ab988d34
4 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -2,7 +2,7 @@ CC?=clang
YC?=yacc YC?=yacc
BIN=doas BIN=doas
PREFIX?=/usr/local PREFIX?=/usr/local
OBJECTS=doas.o env.o execvpe.o y.tab.o OBJECTS=doas.o env.o execvpe.o reallocarray.o y.tab.o
CFLAG+= -DUSE_PAM CFLAG+= -DUSE_PAM
LFLAG+= -lpam LFLAG+= -lpam

6
doas.h
View file

@ -27,11 +27,7 @@ char **prepenv(struct rule *);
#define _PW_NAME_LEN 32 #define _PW_NAME_LEN 32
#endif #endif
#if !defined(HAVE_REALLOCARRAY) && !defined(HAVE_REALLOCARR) void *reallocarray(void *ptr, size_t nmemb, size_t size);
int reallocarr(void *ptr, size_t num, size_t size);
#endif /* !HAVE_REALLOCARRAY && !HAVE_REALLOCARR */
#if !defined(HAVE_EXECVPE) #if !defined(HAVE_EXECVPE)
int execvpe(const char *file, char * const *argv, char * const *envp); int execvpe(const char *file, char * const *argv, char * const *envp);

2
env.c
View file

@ -95,7 +95,7 @@ flattenenv(struct env *env)
struct envnode *node; struct envnode *node;
u_int i; u_int i;
envp = realloc(NULL, (env->count + 1) * sizeof(char *)); envp = reallocarray(NULL, (env->count + 1), sizeof(char *));
if (!envp) if (!envp)
err(1, NULL); err(1, NULL);
i = 0; i = 0;

12
parse.y
View file

@ -84,10 +84,8 @@ rule: action ident target cmd {
maxrules = 63; maxrules = 63;
else else
maxrules *= 2; maxrules *= 2;
/* if (!(rules = reallocarray(rules, maxrules, if (!(rules = reallocarray(rules, maxrules,
sizeof(*rules)))) sizeof(*rules))))
*/
if (!(rules = realloc(rules, maxrules * sizeof(*rules))))
errx(1, "can't allocate rules"); errx(1, "can't allocate rules");
} }
rules[nrules++] = r; rules[nrules++] = r;
@ -127,10 +125,8 @@ envlist: /* empty */ {
errx(1, "can't allocate envlist"); errx(1, "can't allocate envlist");
} | envlist TSTRING { } | envlist TSTRING {
int nenv = arraylen($1.envlist); int nenv = arraylen($1.envlist);
/* if (!($$.envlist = reallocarray($1.envlist, nenv + 2, if (!($$.envlist = reallocarray($1.envlist, nenv + 2,
sizeof(char *)))) sizeof(char *))))
*/
if (!($$.envlist = realloc($1.envlist, (nenv + 2) * sizeof(char*))))
errx(1, "can't allocate envlist"); errx(1, "can't allocate envlist");
$$.envlist[nenv] = $2.str; $$.envlist[nenv] = $2.str;
$$.envlist[nenv + 1] = NULL; $$.envlist[nenv + 1] = NULL;
@ -166,10 +162,8 @@ argslist: /* empty */ {
errx(1, "can't allocate args"); errx(1, "can't allocate args");
} | argslist TSTRING { } | argslist TSTRING {
int nargs = arraylen($1.cmdargs); int nargs = arraylen($1.cmdargs);
/* if (!($$.cmdargs = reallocarray($1.cmdargs, nargs + 2, if (!($$.cmdargs = reallocarray($1.cmdargs, nargs + 2,
sizeof(char *)))) sizeof(char *))))
*/
if (!($$.cmdargs = realloc($1.cmdargs, (nargs + 2) * sizeof(char *))))
errx(1, "can't allocate args"); errx(1, "can't allocate args");
$$.cmdargs[nargs] = $2.str; $$.cmdargs[nargs] = $2.str;
$$.cmdargs[nargs + 1] = NULL; $$.cmdargs[nargs + 1] = NULL;