aboutsummaryrefslogtreecommitdiffstats
path: root/epan/addr_resolv.c
diff options
context:
space:
mode:
authorjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2006-08-29 16:54:39 +0000
committerjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2006-08-29 16:54:39 +0000
commit96459a36184c16a5e0d82fd9ad0f673111d9e4fa (patch)
treed1baaa32e4b9c5e53d138506a8c5fa84769e75bc /epan/addr_resolv.c
parent7c0e1ab48c68d131704bc053bf2b1366fb2067c5 (diff)
Fix for bug 795: handle CR as line end as well
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19075 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/addr_resolv.c')
-rw-r--r--epan/addr_resolv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 44c6f19ed8..bde00bde74 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -585,7 +585,7 @@ static int fgetline(char **buf, int *size, FILE *fp)
return -1;
len = 0;
- while ((c = getc(fp)) != EOF && c != '\n') {
+ while ((c = getc(fp)) != EOF && c != '\r' && c != '\n') {
if (len+1 >= *size) {
if ((*buf = g_realloc(*buf, *size += BUFSIZ)) == NULL)
return -1;