diff options
| author |   Andreas Schwab <schwab@redhat.com> | 2010-02-08 14:36:40 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-02-08 14:36:40 +0100 |
| commit | 299f2f92c8a7955ff09b34b27508cb5c8cf2185e (patch) | |
| tree | 212e51f400a1ee01ec5b3ac081aee425934209ae /misc | |
| parent | 2.11.90-11 (diff) | |
| parent | Whitespace and copyright year fixes. (diff) | |
| download | glibc-299f2f92c8a7955ff09b34b27508cb5c8cf2185e.tar.xz glibc-299f2f92c8a7955ff09b34b27508cb5c8cf2185e.zip | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/getusershell.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/getusershell.c b/misc/getusershell.c index 636da322f9..0e4f79619f 100644 --- a/misc/getusershell.c +++ b/misc/getusershell.c @@ -116,7 +116,8 @@ initshells() } if (statb.st_size > ~(size_t)0 / sizeof (char *) * 3) goto init_okshells; - if ((strings = malloc(statb.st_size + 2)) == NULL) + flen = statb.st_size + 3; + if ((strings = malloc(flen)) == NULL) goto init_okshells; shells = malloc(statb.st_size / 3 * sizeof (char *)); if (shells == NULL) { @@ -126,7 +127,6 @@ initshells() } sp = shells; cp = strings; - flen = statb.st_size + 2; while (fgets_unlocked(cp, flen - (cp - strings), fp) != NULL) { while (*cp != '#' && *cp != '/' && *cp != '\0') cp++; |