From b63b28e7a7e378eeee42d034d157215f9b17cce9 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 3 Oct 2005 19:44:05 +0000 Subject: [PATCH] * getdelim.c: Include getdelim.h first. Include . (SSIZE_MAX): New macro, if not already defined. (getdelim): Fix buffer overrun on 64-bit hosts with lines longer than 2 GiB. --- lib/ChangeLog | 39 +++++++++++++++++++++++++++++++++++++++ lib/getdelim.c | 28 ++++++++++++++++++---------- 2 files changed, 57 insertions(+), 10 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index ce57af82a..575722539 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,42 @@ +2005-10-03 Paul Eggert + + * getdelim.c: Include getdelim.h first. Include . + (SSIZE_MAX): New macro, if not already defined. + (getdelim): Fix buffer overrun on 64-bit hosts with lines longer + than 2 GiB. + +2005-10-02 Paul Eggert + + * exclude.c: Include verify.h. + (verify): Remove. All callers changed to use verify.h's version. + * strtoimax.c: Likewise. + * utimecmp.c: Likewis.e + + Sync from coreutils. + * .cppi-disable: Add getaddrinfo.h, getdelim.h, getline.h, getpass.c + mbchar.h, mbuiter.h, strcase.h, strnlen.h, strnlen1.h. + * .cvsignore: Add fts.h, search.h, t-fpending. + * settime.c (settime): Fix { typo in previous patch. Also, don't + bother returning ENOSYS if settimeofday or stime fails; just let + them return whatever errno they want to return. + * utimens.c: Include unistd.h, for dup2. + (futimens): Fix typo: HAVE_FUTIMESAT was misspelled in an #if. + (futimens) [! HAVE_FUTIMESAT]: If !file, set errno before returning -1. + +2005-10-02 Jim Meyering + + Sync from coreutils. + * fts-cycle.c [HAVE_CONFIG_H]: Include . + * openat-die.c: Use `#ifdef HAVE_CONFIG_H', not `#if HAVE_CONFIG_H'. + * openat.c (fdopendir): Do not define if HAVE_FDOPENDIR. + Remove AT_FDCWD test. + Do not consume the fd unless successful. + * openat.h (fdopendir): Do not define if HAVE_FDOPENDIR. + * settime.c (settime): Move the HAVE_STIME block `up' into an #elif + block, so that we don't even try to compile it if settimeofday is + available. This works around a compilation failure on OSF1 V5.1, + due to stime requiring a `long int*' while tv_sec is `int'. + 2005-09-30 Eric Blake (tiny change) * getdelim.c (getdelim): Remove unused variables. diff --git a/lib/getdelim.c b/lib/getdelim.c index 8dacb73bd..42cac8f55 100644 --- a/lib/getdelim.c +++ b/lib/getdelim.c @@ -23,11 +23,15 @@ # include #endif +#include "getdelim.h" + +#include #include #include -#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,8 +50,8 @@ ssize_t getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp) { - int result = 0; - ssize_t cur_len = 0; + ssize_t result; + size_t cur_len = 0; if (lineptr == NULL || n == NULL || fp == NULL) { @@ -74,18 +78,22 @@ getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp) 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; -- 2.11.0