From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Mon, 23 Dec 2019 16:35:11 +0000 (+0100)
Subject: - Fix dname_has_label() code review changes
X-Git-Tag: release-1.10.0rc1~28^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2abaca7a494f1adbc8aa43833a3482627e315dd7;p=thirdparty%2Funbound.git

- Fix dname_has_label() code review changes
---

diff --git a/util/data/dname.c b/util/data/dname.c
index 366d7a3f5..d55b1358d 100644
--- a/util/data/dname.c
+++ b/util/data/dname.c
@@ -549,9 +549,13 @@ dname_lab_startswith(uint8_t* label, char* prefix, char** endptr)
 int
 dname_has_label(uint8_t* dname, uint8_t* label)
 {
-	uint8_t lablen = *dname++;
-	if(memlowercmp(dname, label, lablen) == 0)
-		return 1;
+	uint8_t lablen = *dname;
+	while(lablen) {
+		if(lablen == *label && memlowercmp(dname, label, lablen) == 0)
+			return 1;
+		dname += lablen;
+		lablen = *dname;
+	}
 	return 0;
 }