- Fix ldns_wire2str_rdata_scan for malformed RRs.

his line, and those below, will be ignored--

M    trunk/doc/Changelog
M    trunk/sldns/wire2str.c

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

diff --git a/doc/Changelog b/doc/Changelog
index 29cf20d146cdba2fd454b3086a3c0bdecca946f7..0518233a35330920612d9520a5ff4b8a249e7147 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 15 October 2015: Wouter
        - Fix segfault in the dns64 module in the formaterror error path.
+       - Fix sldns_wire2str_rdata_scan for malformed RRs.
 
 14 October 2015: Wouter
        - ANY responses include DNAME records if present, as per Evan Hunt's

diff --git a/sldns/wire2str.c b/sldns/wire2str.c
index cec3bc7b08da54c66713401317ebceeb9c7cfc46..5cbd78eedb29630321aa44bd8e5559eb16472a6e 100644 (file)
--- a/sldns/wire2str.c
+++ b/sldns/wire2str.c
@@ -697,6 +697,9 @@ int sldns_wire2str_rdata_scan(uint8_t** d, size_t* dlen, char** s,
                }
                w += n;
        }
+       if(*dlen != 0) {
+               goto failed;
+       }
        return w;
 }