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.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 448ff131a532b62e48b23aeabdae93eec4d40403..7af8c23d9df71a58204c14a3c61e2d3787e13508 100644 (file)
--- 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 8498b7556a8582721f98e47a67e35da5417ce678..42cac8f558522c269fd0c57a6cf7ebab601a1ba9 100644 (file)
--- 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;