From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 14 Feb 2014 09:25:00 +0000 (+0000)
Subject: Fix ldns_fgetc bug similar to ldns_bgetc.
X-Git-Tag: release-1.4.22rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9472d554e13168872affab8fc2baf543a77aa1bb;p=thirdparty%2Funbound.git

Fix ldns_fgetc bug similar to ldns_bgetc.


git-svn-id: file:///svn/unbound/trunk@3083 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/ldns/parse.c b/ldns/parse.c
index 809bd2286..d0934ffb1 100644
--- a/ldns/parse.c
+++ b/ldns/parse.c
@@ -163,7 +163,11 @@ sldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *l
 	return (ssize_t)i;
 
 tokenread:
-	sldns_fskipcs_l(f, del, line_nr);
+	if(*del == '"')
+		/* do not skip over quotes after the string, they are part
+		 * of the next string.  But skip over whitespace (if needed)*/
+		sldns_fskipcs_l(f, del+1, line_nr);
+	else	sldns_fskipcs_l(f, del, line_nr);
 	*t = '\0';
 	if (p != 0) {
 		return -1;