From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 23 Apr 2018 10:35:35 +0000 (+0000)
Subject: - Fix sldns parse failure for CDS alternate delete syntax empty hex.
X-Git-Tag: release-1.7.1rc1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d18256828dc8b48ef03830acd26168dcdb98a2a;p=thirdparty%2Funbound.git

- Fix sldns parse failure for CDS alternate delete syntax empty hex.


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

diff --git a/doc/Changelog b/doc/Changelog
index 10933e533..7b5ed7ea8 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 	  config_set_option.
 	- auth zone http download stores exact copy of downloaded file,
 	  including comments in the file.
+	- Fix sldns parse failure for CDS alternate delete syntax empty hex.
 
 20 April 2018: Wouter
 	- man page documentation for dns-over-tls forward-addr '#' notation.
diff --git a/services/authzone.c b/services/authzone.c
index b1b72ae93..4ade1fc62 100644
--- a/services/authzone.c
+++ b/services/authzone.c
@@ -4220,6 +4220,11 @@ chunkline_newline_removal(sldns_buffer* buf)
 	size_t i, end=sldns_buffer_limit(buf);
 	for(i=0; i<end; i++) {
 		char c = (char)sldns_buffer_read_u8_at(buf, i);
+		if(c == '\n' && i==end-1) {
+			sldns_buffer_write_u8_at(buf, i, 0);
+			sldns_buffer_set_limit(buf, end-1);
+			return;
+		}
 		if(c == '\n')
 			sldns_buffer_write_u8_at(buf, i, (uint8_t)' ');
 	}
diff --git a/sldns/str2wire.c b/sldns/str2wire.c
index fdb355754..1a51bb695 100644
--- a/sldns/str2wire.c
+++ b/sldns/str2wire.c
@@ -1225,6 +1225,17 @@ int sldns_str2wire_b32_ext_buf(const char* str, uint8_t* rd, size_t* len)
 	return LDNS_WIREPARSE_ERR_OK;
 }
 
+/** see if the string ends, or ends in whitespace */
+static int
+sldns_is_last_of_string(const char* str)
+{
+	if(*str == 0) return 1;
+	while(isspace((unsigned char)*str))
+		str++;
+	if(*str == 0) return 1;
+	return 0;
+}
+
 int sldns_str2wire_hex_buf(const char* str, uint8_t* rd, size_t* len)
 {
 	const char* s = str;
@@ -1234,7 +1245,7 @@ int sldns_str2wire_hex_buf(const char* str, uint8_t* rd, size_t* len)
 			s++;
 			continue;
 		}
-		if(dlen == 0 && *s == '0' && *(s+1) == 0) {
+		if(dlen == 0 && *s == '0' && sldns_is_last_of_string(s+1)) {
 			*len = 0;
 			return LDNS_WIREPARSE_ERR_OK;
 		}