CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-10 22:24:12 +02:00
Code Issues Projects Releases Wiki Activity

(getndelim2): Upon realloc failure, don't leak memory.

Browse Source
This commit is contained in:
Jim Meyering
2004-04-20 06:51:07 +00:00
parent 4ef7ed5d49
commit 335e3339ff
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/getndelim2.c
View File

@@ -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 @@ getndelim2 (char **lineptr, size_t *linesize, size_t nmax,
{
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;
}