diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2005-10-02 22:49:49 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-10-02 22:49:49 +0000 |
| commit | ca7be845260fc6b97bf1bf316b75b9c7a6c1a346 (patch) | |
| tree | 5fd2f0f436a6b390c0c0e50389117e7bb8e19caa /lib | |
| parent | fbc02ac7840aba4629ecd92c1fa9f451ee95abd2 (diff) | |
| download | coreutils-ca7be845260fc6b97bf1bf316b75b9c7a6c1a346.tar.xz | |
Import getdelim.c from gnulib (to fix unused var warnings) then
apply the following fixes:
Include getdelim.h first. Include <limits.h>.
(SSIZE_MAX): New macro, if not already defined.
(getdelim): Fix buffer overrun on 64-bit hosts with lines longer
than 2 GiB.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ChangeLog | 9 | ||||
| -rw-r--r-- | lib/getdelim.c | 30 |
2 files changed, 27 insertions, 12 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 448ff131a..7af8c23d9 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,12 @@ +2005-10-02 Paul Eggert <eggert@cs.ucla.edu> + + * getdelim.c: Import from gnulib (to fix unused var warnings) then + apply the following fixes: + Include getdelim.h first. Include <limits.h>. + (SSIZE_MAX): New macro, if not already defined. + (getdelim): Fix buffer overrun on 64-bit hosts with lines longer + than 2 GiB. + 2005-10-01 Simon Josefsson <jas@extundo.com> * getaddrinfo.h: Protect #include's of sys/socket.h and netdb.h. diff --git a/lib/getdelim.c b/lib/getdelim.c index 8498b7556..42cac8f55 100644 --- a/lib/getdelim.c +++ b/lib/getdelim.c @@ -23,11 +23,15 @@ # include <config.h> #endif +#include "getdelim.h" + +#include <limits.h> #include <stdlib.h> #include <errno.h> -#include "getdelim.h" - +#ifndef SSIZE_MAX +# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) +#endif #if !HAVE_FLOCKFILE # undef flockfile # define flockfile(x) ((void) 0) @@ -46,9 +50,8 @@ ssize_t getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp) { - int result = 0; - ssize_t cur_len = 0; - ssize_t len; + ssize_t result; + size_t cur_len = 0; if (lineptr == NULL || n == NULL || fp == NULL) { @@ -71,23 +74,26 @@ getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp) for (;;) { - char *t; int i; i = getc (fp); if (i == EOF) - { - result = -1; - break; - } + { + result = -1; + break; + } /* Make enough space for len+1 (for final NUL) bytes. */ if (cur_len + 1 >= *n) { - size_t needed = 2 * (cur_len + 1) + 1; /* Be generous. */ + size_t needed_max = + SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX; + size_t needed = 2 * *n + 1; /* Be generous. */ char *new_lineptr; - if (needed < cur_len) + if (needed_max < needed) + needed = needed_max; + if (cur_len + 1 >= needed) { result = -1; goto unlock_return; |