diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2006-08-29 16:54:39 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2006-08-29 16:54:39 +0000 |
| commit | 05aa18b52261dffb9b672e5b72be04729d0a4c33 (patch) | |
| tree | d1baaa32e4b9c5e53d138506a8c5fa84769e75bc /epan/addr_resolv.c | |
| parent | 5b99f2173532f396169d5360c3bf28638984e615 (diff) | |
| download | wireshark-05aa18b52261dffb9b672e5b72be04729d0a4c33.tar.gz wireshark-05aa18b52261dffb9b672e5b72be04729d0a4c33.tar.bz2 wireshark-05aa18b52261dffb9b672e5b72be04729d0a4c33.zip | |
Fix for bug 795: handle CR as line end as well
svn path=/trunk/; revision=19075
Diffstat (limited to 'epan/addr_resolv.c')
| -rw-r--r-- | epan/addr_resolv.c | 2 |
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; |