diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-12-10 10:38:56 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-12-10 10:38:56 +0000 |
| commit | b0ec19ce6e64c405fdd95c90a5d4212f86abea1f (patch) | |
| tree | 9f52f1f004f36f9bd712fe2fb753736733f6324c /misc/getusershell.c | |
| parent | 7f65f3e3920a0dd6bb6a8774f46063371be4d029 (diff) | |
Updated to fedora-glibc-20061210T1006
Diffstat (limited to 'misc/getusershell.c')
| -rw-r--r-- | misc/getusershell.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/misc/getusershell.c b/misc/getusershell.c index 255b579b1a..636da322f9 100644 --- a/misc/getusershell.c +++ b/misc/getusershell.c @@ -98,7 +98,7 @@ initshells() register char **sp, *cp; register FILE *fp; struct stat64 statb; - int flen; + size_t flen; free(shells); shells = NULL; @@ -114,9 +114,11 @@ initshells() okshells[1] = _PATH_CSHELL; return (char **) okshells; } - if ((strings = malloc((u_int)statb.st_size + 1)) == NULL) + if (statb.st_size > ~(size_t)0 / sizeof (char *) * 3) goto init_okshells; - shells = calloc((unsigned)statb.st_size / 3, sizeof (char *)); + if ((strings = malloc(statb.st_size + 2)) == NULL) + goto init_okshells; + shells = malloc(statb.st_size / 3 * sizeof (char *)); if (shells == NULL) { free(strings); strings = NULL; @@ -124,11 +126,11 @@ initshells() } sp = shells; cp = strings; - flen = statb.st_size; + flen = statb.st_size + 2; while (fgets_unlocked(cp, flen - (cp - strings), fp) != NULL) { while (*cp != '#' && *cp != '/' && *cp != '\0') cp++; - if (*cp == '#' || *cp == '\0') + if (*cp == '#' || *cp == '\0' || cp[1] == '\0') continue; *sp++ = cp; while (!isspace(*cp) && *cp != '#' && *cp != '\0') |