fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libutil/getlines: fix crash with no lines

Browse Source 
because b->lines and b->nlines would be 0 with no lines read.

reproduce: printf '' | sort or cols

bug was introduced by commit: 66a5ea722d
This commit is contained in:
Hiltjo Posthuma
2015-03-29 21:48:49 +02:00
parent 1e0c3a0ba6
commit 9f97430143
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libutil/getlines.c
View File

@@ -9,20 +9,21 @@
void void
getlines(FILE *fp, struct linebuf *b) getlines(FILE *fp, struct linebuf *b)
{ {
char *line = NULL, **nline; char *line = NULL;
size_t size = 0, linelen; size_t size = 0, linelen;
ssize_t len; ssize_t len;
while ((len = getline(&line, &size, fp)) > 0) { while ((len = getline(&line, &size, fp)) > 0) {
if (++b->nlines > b->capacity) { if (++b->nlines > b->capacity) {
b->capacity += 512; b->capacity += 512;
nline = erealloc(b->lines, b->capacity * sizeof(*b->lines)); b->lines = erealloc(b->lines, b->capacity * sizeof(*b->lines));
b->lines = nline;
} }
linelen = len + 1; linelen = len + 1;
b->lines[b->nlines - 1] = memcpy(emalloc(linelen), line, linelen); b->lines[b->nlines - 1] = memcpy(emalloc(linelen), line, linelen);
} }
free(line); free(line);
if(!b->nlines || !b->lines)
return;
if (!strchr(b->lines[b->nlines - 1], '\n')) { if (!strchr(b->lines[b->nlines - 1], '\n')) {
b->lines[b->nlines - 1] = erealloc(b->lines[b->nlines - 1], linelen + 1); b->lines[b->nlines - 1] = erealloc(b->lines[b->nlines - 1], linelen + 1);
b->lines[b->nlines - 1][linelen - 1] = '\n'; b->lines[b->nlines - 1][linelen - 1] = '\n';