- Fix to ensure uniform handling of spaces and tabs when parsing RRs.

diff --git a/doc/Changelog b/doc/Changelog
index 93e45277579a9af2ffd0b6ad37013378ddfe97c4..8b885b83c91ebb3f341c863a4eb60d9bdd47978e 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+16 March 2022: Wouter
+       - Fix to ensure uniform handling of spaces and tabs when parsing RRs.
+
 9 March 2022: Wouter
        - Merge #644: Make `install-lib` make target install the pkg-config
          file.

diff --git a/sldns/str2wire.c b/sldns/str2wire.c
index 09dedb0d7e84ef73e76d7fa1ba2fb1ccb90716ca..5cfd3c5851c7b0aeea11471844ebe458190268cb 100644 (file)
--- a/sldns/str2wire.c
+++ b/sldns/str2wire.c
@@ -378,7 +378,8 @@ rrinternal_get_quoted(sldns_buffer* strbuf, const char** delimiters,
 
                /* skip spaces */
                while(sldns_buffer_remaining(strbuf) > 0 &&
-                       *(sldns_buffer_current(strbuf)) == ' ') {
+                       (*(sldns_buffer_current(strbuf)) == ' ' ||
+                       *(sldns_buffer_current(strbuf)) == '\t')) {
                        sldns_buffer_skip(strbuf, 1);
                }
 
@@ -780,7 +781,8 @@ rrinternal_parse_rdata(sldns_buffer* strbuf, char* token, size_t token_len,
 
                /* unknown RR data */
                if(token_strlen>=2 && strncmp(token, "\\#", 2) == 0 &&
-                       !quoted && (token_strlen == 2 || token[2]==' ')) {
+                       !quoted && (token_strlen == 2 || token[2]==' ' ||
+                       token[2]=='\t')) {
                        was_unknown_rr_format = 1;
                        if((status=rrinternal_parse_unknown(strbuf, token,
                                token_len, rr, rr_len, &rr_cur_len,