Put back
http://anonsvn.wireshark.org/viewvc?view=rev&revision=29656 http://anonsvn.wireshark.org/viewvc?view=rev&revision=29658 http://anonsvn.wireshark.org/viewvc?view=rev&revision=29661 Reverted by my previous checkin. svn path=/trunk/; revision=29749
This commit is contained in:
parent
f641693bf4
commit
a4ce0d3d69
|
@ -369,18 +369,19 @@ static int fgetline(char **buf, int *size, FILE *fp)
|
|||
if (*size == 0)
|
||||
*size = BUFSIZ;
|
||||
|
||||
if ((*buf = g_malloc(*size)) == NULL)
|
||||
return -1;
|
||||
*buf = g_malloc(*size);
|
||||
}
|
||||
|
||||
g_assert(*buf);
|
||||
g_assert(*size > 0);
|
||||
|
||||
if (feof(fp))
|
||||
return -1;
|
||||
|
||||
len = 0;
|
||||
while ((c = getc(fp)) != EOF && c != '\r' && c != '\n') {
|
||||
if (len+1 >= *size) {
|
||||
if ((*buf = g_realloc(*buf, *size += BUFSIZ)) == NULL)
|
||||
return -1;
|
||||
*buf = g_realloc(*buf, *size += BUFSIZ);
|
||||
}
|
||||
(*buf)[len++] = c;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue