Index: stable/10/lib/libc/stdio/fgetln.3 =================================================================== --- stable/10/lib/libc/stdio/fgetln.3 (revision 304815) +++ stable/10/lib/libc/stdio/fgetln.3 (revision 304816) @@ -1,125 +1,128 @@ .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" @(#)fgetln.3 8.3 (Berkeley) 4/19/94 .\" $FreeBSD$ .\" -.Dd April 19, 1994 +.Dd February 15, 2016 .Dt FGETLN 3 .Os .Sh NAME .Nm fgetln .Nd get a line from a stream .Sh LIBRARY .Lb libc .Sh SYNOPSIS .In stdio.h .Ft char * .Fn fgetln "FILE *stream" "size_t *len" .Sh DESCRIPTION The .Fn fgetln function returns a pointer to the next line from the stream referenced by .Fa stream . This line is .Em not a C string as it does not end with a terminating .Dv NUL character. The length of the line, including the final newline, is stored in the memory location to which .Fa len points. (Note, however, that if the line is the last in a file that does not end in a newline, the returned text will not contain a newline.) .Sh RETURN VALUES Upon successful completion a pointer is returned; this pointer becomes invalid after the next .Tn I/O operation on .Fa stream (whether successful or not) or as soon as the stream is closed. Otherwise, .Dv NULL is returned. The .Fn fgetln function does not distinguish between end-of-file and error; the routines .Xr feof 3 and .Xr ferror 3 must be used to determine which occurred. If an error occurs, the global variable .Va errno is set to indicate the error. The end-of-file condition is remembered, even on a terminal, and all subsequent attempts to read will return .Dv NULL until the condition is cleared with .Xr clearerr 3 . .Pp The text to which the returned pointer points may be modified, provided that no changes are made beyond the returned size. These changes are lost as soon as the pointer becomes invalid. .Sh ERRORS .Bl -tag -width Er .It Bq Er EBADF The argument .Fa stream is not a stream open for reading. +.It Bq Er ENOMEM +The internal line buffer could not be expanded due to lack of available memory, +or because it would need to expand beyond INT_MAX in size. .El .Pp The .Fn fgetln function may also fail and set .Va errno for any of the errors specified for the routines .Xr fflush 3 , .Xr malloc 3 , .Xr read 2 , .Xr stat 2 , or .Xr realloc 3 . .Sh SEE ALSO .Xr ferror 3 , .Xr fgets 3 , .Xr fgetwln 3 , .Xr fopen 3 , .Xr getline 3 , .Xr putc 3 .Sh HISTORY The .Fn fgetln function first appeared in .Bx 4.4 . Index: stable/10/lib/libc/stdio/fgetln.c =================================================================== --- stable/10/lib/libc/stdio/fgetln.c (revision 304815) +++ stable/10/lib/libc/stdio/fgetln.c (revision 304816) @@ -1,165 +1,171 @@ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Chris Torek. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fgetln.c 8.2 (Berkeley) 1/2/94"; #endif /* LIBC_SCCS and not lint */ #include __FBSDID("$FreeBSD$"); #include "namespace.h" +#include +#include #include #include #include #include "un-namespace.h" #include "libc_private.h" #include "local.h" /* * Expand the line buffer. Return -1 on error. #ifdef notdef * The `new size' does not account for a terminating '\0', * so we add 1 here. #endif */ int __slbexpand(FILE *fp, size_t newsize) { void *p; #ifdef notdef ++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; fp->_lb._size = newsize; return (0); } /* * Get an input line. The returned pointer often (but not always) * points into a stdio buffer. Fgetln does not alter the text of * the returned line (which is thus not a C string because it will * not necessarily end with '\0'), but does allow callers to modify * it if they wish. Thus, we set __SMOD in case the caller does. */ char * fgetln(FILE *fp, size_t *lenp) { unsigned char *p; size_t len; size_t off; FLOCKFILE(fp); ORIENT(fp, -1); /* make sure there is input */ if (fp->_r <= 0 && __srefill(fp)) { *lenp = 0; FUNLOCKFILE(fp); return (NULL); } /* look for a newline in the input */ if ((p = memchr((void *)fp->_p, '\n', (size_t)fp->_r)) != NULL) { char *ret; /* * Found one. Flag buffer as modified to keep fseek from * `optimising' a backward seek, in case the user stomps on * the text. */ p++; /* advance over it */ ret = (char *)fp->_p; *lenp = len = p - fp->_p; fp->_flags |= __SMOD; fp->_r -= len; fp->_p = p; FUNLOCKFILE(fp); return (ret); } /* * We have to copy the current buffered data to the line buffer. * As a bonus, though, we can leave off the __SMOD. * * OPTIMISTIC is length that we (optimistically) expect will * accommodate the `rest' of the string, on each trip through the * loop below. */ #define OPTIMISTIC 80 for (len = fp->_r, off = 0;; len += fp->_r) { size_t diff; /* * Make sure there is room for more bytes. Copy data from * file buffer to line buffer, refill file and look for * newline. The loop stops only when we find a newline. */ if (__slbexpand(fp, len + OPTIMISTIC)) goto error; (void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p, len - off); off = len; if (__srefill(fp)) break; /* EOF or error: return partial line */ if ((p = memchr((void *)fp->_p, '\n', (size_t)fp->_r)) == NULL) continue; /* got it: finish up the line (like code above) */ p++; diff = p - fp->_p; len += diff; if (__slbexpand(fp, len)) goto error; (void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p, diff); fp->_r -= diff; fp->_p = p; break; } *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); /* ??? */ } Index: stable/10 =================================================================== --- stable/10 (revision 304815) +++ stable/10 (revision 304816) Property changes on: stable/10 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r295632