- Add code similar to fix for ldns for tab between strings, for

  consistency, the test case was not broken.

diff --git a/doc/Changelog b/doc/Changelog
index e086264523cca312907fbe1e755080c8432b678c..8a5a3231719374b79c8e0e1501ab500cf0a060df 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+10 December 2021: Wouter
+       - Add code similar to fix for ldns for tab between strings, for
+         consistency, the test case was not broken.
+
 6 December 2021: Wouter
        - Merge PR #581 from fobser: Fix -Wmissing-prototypes and -Wshadow
          warnings in rpz.

diff --git a/sldns/str2wire.c b/sldns/str2wire.c
index ddaccd1b292dde718ff956040afb24e13254ab43..1e57211c108a33c640c5ddce92337ceafe6e335f 100644 (file)
--- a/sldns/str2wire.c
+++ b/sldns/str2wire.c
@@ -543,9 +543,10 @@ sldns_parse_rdf_token(sldns_buffer* strbuf, char* token, size_t token_len,
 {
        size_t slen;
 
-       /* skip spaces */
+       /* skip spaces and tabs */
        while(sldns_buffer_remaining(strbuf) > 0 && !*quoted &&
-               *(sldns_buffer_current(strbuf)) == ' ') {
+               (*(sldns_buffer_current(strbuf)) == ' ' ||
+               *(sldns_buffer_current(strbuf)) == '\t')) {
                sldns_buffer_skip(strbuf, 1);
        }
 

diff --git a/testdata/test_ldnsrr.5 b/testdata/test_ldnsrr.5
index c6e7ea2ba549f3b8aa8a48c9a27db91e270ab9a3..2762ca82d3274d62cb7fe78048c2198ce87741ff 100644 (file)
--- a/testdata/test_ldnsrr.5
+++ b/testdata/test_ldnsrr.5
@@ -172,3 +172,5 @@ uri.arpa.       3600    IN      ZONEMD  2018100702 1 1 ( 1291b78ddf7669b1a39d014
 root-servers.net.     3600000 IN  ZONEMD  2018091100 1 1 ( f1ca0ccd91bd5573d9f431c00ee0101b2545c97602be0a97 8a3b11dbfc1c776d5b3e86ae3d973d6b5349ba7f04340f79 )
 ; from ldns issue #121, 0.10m was parsed as 0.01m.
 foo.   12345   IN      LOC     12 45 52.333 N 105 40 33.452 W -24m 0.1m 0.1m 0.1m
+; from ldns issue #147, fix #148, tab between quoted strings.
+foo    12345   IN      HINFO   "hohum" "weirdo"

diff --git a/testdata/test_ldnsrr.c5 b/testdata/test_ldnsrr.c5
index f30aa0b7357c508538fd4004633252d40fe56cf6..e86532c3433e2eca01d300980eb10dde22eca40c 100644 (file)
--- a/testdata/test_ldnsrr.c5
+++ b/testdata/test_ldnsrr.c5
@@ -212,3 +212,5 @@ uri.arpa.   3600    IN      ZONEMD  2018100702 1 1 1291B78DDF7669B1A39D014D87626B709B55774C
 root-servers.net.      3600000 IN      ZONEMD  2018091100 1 1 F1CA0CCD91BD5573D9F431C00EE0101B2545C97602BE0A978A3B11DBFC1C776D5B3E86AE3D973D6B5349BA7F04340F79
 03666F6F00001D00010000303900100011111182BD2D4D69530BD400988D20
 foo.   12345   IN      LOC     12 45 52.333 N 105 40 33.452 W -24m 0.10m 0.10m 0.10m
+03666F6F00000D000100003039000D05686F68756D0677656972646F
+foo.   12345   IN      HINFO   "hohum" "weirdo"