Mercurial > hg > octave-lyh > gnulib-hg

changeset 5049:51ca4edd7b57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(getndelim2): Upon realloc failure, don't leak memory.
author Jim Meyering <jim@meyering.net>
date Sun, 25 Apr 2004 14:12:22 +0000
parents 76a87612cfd9
children e0d56b225a1f
files lib/getndelim2.c
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lib/getndelim2.c
+++ b/lib/getndelim2.c
@@ -1,7 +1,7 @@
 /* getndelim2 - Read a line from a stream, stopping at one of 2 delimiters,
    with bounded memory allocation.
 
-   Copyright (C) 1993, 1996, 1997, 1998, 2000, 2003 Free Software
+   Copyright (C) 1993, 1996, 1997, 1998, 2000, 2003, 2004 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -80,15 +80,17 @@
 	{
 	  size_t newlinesize =
 	    (*linesize > MIN_CHUNK ? 2 * *linesize : *linesize + MIN_CHUNK);
+	  char *p;
 
 	  if (! (*linesize < newlinesize && newlinesize <= nmax))
 	    newlinesize = nmax;
 
 	  *linesize = newlinesize;
 	  nbytes_avail = *linesize + *lineptr - read_pos;
-	  *lineptr = realloc (*lineptr, *linesize);
-	  if (!*lineptr)
+	  p = realloc (*lineptr, *linesize);
+	  if (!p)
 	    return -1;
+	  *lineptr = p;
 	  read_pos = *linesize - nbytes_avail + *lineptr;
 	}