diff options
| author | dim <dim@FreeBSD.org> | 2016-02-21 13:49:26 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-02-21 13:49:26 +0000 |
| commit | 2e1a0cbbd8f5a5ca7ec73c85311451ed1ac4242c (patch) | |
| tree | bb5f550a5fd2ee1357495987f5076839273e5998 /lib/libc/stdio/fgetln.c | |
| parent | f393760a8a7c87242739a64002290b7bda94cb27 (diff) | |
| parent | 579b7ad49fdbcb4dd1e016603c5d0774b32c12d1 (diff) | |
| download | FreeBSD-src-2e1a0cbbd8f5a5ca7ec73c85311451ed1ac4242c.zip FreeBSD-src-2e1a0cbbd8f5a5ca7ec73c85311451ed1ac4242c.tar.gz | |
Merge ^/head r295601 through r295844.
Diffstat (limited to 'lib/libc/stdio/fgetln.c')
| -rw-r--r-- | lib/libc/stdio/fgetln.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/libc/stdio/fgetln.c b/lib/libc/stdio/fgetln.c index 1779de2..1509bc8 100644 --- a/lib/libc/stdio/fgetln.c +++ b/lib/libc/stdio/fgetln.c @@ -37,6 +37,8 @@ static char sccsid[] = "@(#)fgetln.c 8.2 (Berkeley) 1/2/94"; __FBSDID("$FreeBSD$"); #include "namespace.h" +#include <errno.h> +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -61,6 +63,10 @@ __slbexpand(FILE *fp, size_t newsize) #endif if (fp->_lb._size >= newsize) return (0); + if (newsize > INT_MAX) { + errno = ENOMEM; + return (-1); + } if ((p = realloc(fp->_lb._base, newsize)) == NULL) return (-1); fp->_lb._base = p; @@ -152,13 +158,14 @@ fgetln(FILE *fp, size_t *lenp) } *lenp = len; #ifdef notdef - fp->_lb._base[len] = 0; + fp->_lb._base[len] = '\0'; #endif FUNLOCKFILE(fp); return ((char *)fp->_lb._base); error: *lenp = 0; /* ??? */ + fp->_flags |= __SERR; FUNLOCKFILE(fp); return (NULL); /* ??? */ } |
