From a4ce0d3d69bcd8f17b1e4898c777c66c773ac252 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Sun, 6 Sep 2009 14:53:21 +0000 Subject: [PATCH] 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 --- epan/addr_resolv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 5a1f4e22f4..e1b7aaf79c 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -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; }