X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetdelim.c;h=e0b8a708ba7d4bb8b66e1f7629bc852e77451f19;hb=7b9878d56ceb1a8ed1255ea1e6010638af7252c6;hp=8498b7556a8582721f98e47a67e35da5417ce678;hpb=222b0486b7db1b09293e05512873d633440efcb3;p=gnulib.git

diff --git a/lib/getdelim.c b/lib/getdelim.c
index 8498b7556..e0b8a708b 100644
--- a/lib/getdelim.c
+++ b/lib/getdelim.c
@@ -1,5 +1,5 @@
 /* getdelim.c --- Implementation of replacement getdelim function.
-   Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005 Free
+   Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005, 2006 Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
@@ -19,15 +19,20 @@
 
 /* Ported from glibc by Simon Josefsson. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
+#include "getdelim.h"
 
+#include <limits.h>
 #include <stdlib.h>
 #include <errno.h>
 
-#include "getdelim.h"
-
+#ifndef SIZE_MAX
+# define SIZE_MAX ((size_t) -1)
+#endif
+#ifndef SSIZE_MAX
+# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
+#endif
 #if !HAVE_FLOCKFILE
 # undef flockfile
 # define flockfile(x) ((void) 0)
@@ -46,9 +51,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 +75,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;