- test for too lenient LOC record

- remove temporary review comments

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

diff --git a/ldns/str2wire.c b/ldns/str2wire.c
index fffd2b34ee0c0283c257f61cf737a20829af9078..707f3feb23a73cb22a6916f7bbb6bae78f645b47 100644 (file)
--- a/ldns/str2wire.c
+++ b/ldns/str2wire.c
@@ -74,8 +74,8 @@ static int sldns_str2wire_dname_buf_rel(const char* str, uint8_t* buf,
        len = 0;
        if(*olen < 1)
                return RET_ERR(LDNS_WIREPARSE_ERR_BUFFER_TOO_SMALL, 0);
-       q = buf+1; /* p */
-       pq = buf; /* h */
+       q = buf+1;
+       pq = buf;
        label_len = 0;
        for (s = str; *s; s++, q++) {
                if (q >= buf + *olen)

diff --git a/testdata/test_ldnsrr.4 b/testdata/test_ldnsrr.4
index 27053e78d3d3ccb842024f917f6ffc5775d32905..07c9960d50537c93550380e374de87e996d771f2 100644 (file)
--- a/testdata/test_ldnsrr.4
+++ b/testdata/test_ldnsrr.4
@@ -29,6 +29,8 @@ all.rr.org.           IN      PX              10   net2.it.  PRMD-net2.ADMD-p400.C-it.
 ; GPOS
 all.rr.org.            IN      AAAA            2001:db8::3
 all.rr.org.            IN      LOC             42 21 54.5 N 71 06 18.3 W -24m 30m
+; too lenient LOC record
+all.rr.org.            IN      LOC             42N 71 06 18.3W -24m 30m
 ; NXT
 ; EID
 ; NIMLOC

diff --git a/testdata/test_ldnsrr.c4 b/testdata/test_ldnsrr.c4
index 78591fcbc3a17d46eb06928e61648969ad6293d6..56b87fbcbbf40f81676e07db8a1469195b462c26 100644 (file)
--- a/testdata/test_ldnsrr.c4
+++ b/testdata/test_ldnsrr.c4
@@ -42,6 +42,8 @@ all.rr.org.   3600    IN      PX      10 net2.it. PRMD-net2.ADMD-p400.C-it.
 all.rr.org.    3600    IN      AAAA    2001:db8::3
 03616C6C027272036F726700001D000100000E1000100033161389172FC470BE14C400988D20
 all.rr.org.    3600    IN      LOC     42 21 54.500 N 71 06 18.300 W -24m 30m 10000m 10m
+03616C6C027272036F726700001D000100000E100010003316138903210070BE14C400988D20
+all.rr.org.    3600    IN      LOC     42 00 00.000 N 71 06 18.300 W -24m 30m 10000m 10m
 055F68747470045F74637003616C6C027272036F7267000021000100000E100017000000050050036E7331076578616D706C6503636F6D00
 _http._tcp.all.rr.org. 3600    IN      SRV     0 5 80 ns1.example.com.
 03616C6C027272036F7267000023000100000E1000290064000A000021215E75726E3A6369643A2E2B40285B5E5C2E5D2B5C2E29282E2A2924215C32216900