diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1996-11-12 07:23:23 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1996-11-12 07:23:23 +0000 |
| commit | faee7bb1b3739dbe0ced03b8e433532908761e41 (patch) | |
| tree | d17c5fece20790d5286eb93360d16fc2e5b77533 /gnu/usr.bin | |
| parent | 405c86da2692c5370b2d83ba088b410552466f99 (diff) | |
Fix bug with > 32 saved aliases. Don't overshadow global var with
local instantiation! (I didn't write that code, honest!)
Diffstat (limited to 'gnu/usr.bin')
| -rw-r--r-- | gnu/usr.bin/sudo/sudo/parse.yacc | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/gnu/usr.bin/sudo/sudo/parse.yacc b/gnu/usr.bin/sudo/sudo/parse.yacc index d4eae696d3a..c98d7c347b2 100644 --- a/gnu/usr.bin/sudo/sudo/parse.yacc +++ b/gnu/usr.bin/sudo/sudo/parse.yacc @@ -27,7 +27,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: parse.yacc,v 1.3 1996/11/11 15:34:40 millert Exp $"; +static char rcsid[] = "$Id: parse.yacc,v 1.4 1996/11/12 07:23:22 millert Exp $"; #endif /* lint */ #include "config.h" @@ -133,7 +133,7 @@ extern int netgr_matches __P((char *, char *, char *)); extern int usergr_matches __P((char *, char *)); static int find_alias __P((char *, int)); static int add_alias __P((char *, int)); -static int more_aliases __P((size_t)); +static int more_aliases __P((void)); static void append __P((char *, char **, size_t *, size_t *, int)); static void expand_ca_list __P((void)); static void expand_match_list __P((void)); @@ -625,7 +625,7 @@ static int add_alias(alias, type) (void) sprintf(s, "Alias `%s' already defined", alias); yyerror(s); } else { - if (naliases == nslots && !more_aliases(nslots)) { + if (naliases == nslots && !more_aliases()) { (void) sprintf(s, "Out of memory defining alias `%s'", alias); yyerror(s); } @@ -673,23 +673,15 @@ static int find_alias(alias, type) * This function allocates more space for the aliases list. */ -static int more_aliases(nslots) - size_t nslots; +static int more_aliases() { - aliasinfo *aip; - - if (nslots == 0) - aip = (aliasinfo *) malloc(MOREALIASES * sizeof(*aip)); + nslots += MOREALIASES; + if (nslots == MOREALIASES) + aliases = (aliasinfo *) malloc(nslots * sizeof(aliasinfo)); else - aip = (aliasinfo *) realloc(aliases, - (nslots + MOREALIASES) * sizeof(*aip)); - - if (aip != NULL) { - aliases = aip; - nslots += MOREALIASES; - } + aliases = (aliasinfo *) realloc(aliases, nslots * sizeof(aliasinfo)); - return(aip != NULL); + return(aliases != NULL); } |