only skip whitespace if not quoted

diff --git a/rdata.c b/rdata.c
index 37e36e6c71f6609af530c18a7cc830af32b35fcd..8af16a13a1c2e85d59a60f99e534590742d85068 100644 (file)
--- a/rdata.c
+++ b/rdata.c
@@ -483,7 +483,7 @@ ldns_rdf_address_reverse(ldns_rdf *rd)
                                LDNS_FREE(char_dname);
                                return NULL;
                        }
-               
+
                        /* convert rev to a string */
                        ret_dname = ldns_dname_new_frm_str(char_dname);
                        LDNS_FREE(char_dname);
@@ -497,7 +497,7 @@ ldns_rdf_address_reverse(ldns_rdf *rd)
        }
        /* add the suffix */
        rev = ldns_dname_cat_clone(ret_dname, in_addr);
-       
+
        ldns_rdf_deep_free(ret_dname);
        ldns_rdf_deep_free(in_addr);
        return rev;

diff --git a/rr.c b/rr.c
index ce0eab77883e7c710300e5d565a29eba7e1e547b..7b799b9b56551e5b8fc2cb7321289aa6dda51440 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -378,7 +378,7 @@ ldns_rr_new_frm_str_internal(ldns_rr **newrr, const char *str,
                                   rely on _maximum() only */
                                /* skip spaces */
                                while (ldns_buffer_position(rd_buf) < ldns_buffer_limit(rd_buf) &&
-                                       *(ldns_buffer_current(rd_buf)) == ' '
+                                       *(ldns_buffer_current(rd_buf)) == ' ' && !quoted
                                      ) {
                                        ldns_buffer_skip(rd_buf, 1);
                                }

diff --git a/str2host.c b/str2host.c
index b12f31f3b47cf24cf7355bfe4fa1cb4b7b4d8166..2eda2f805b64b47550eaef34460ce706e01c0860 100644 (file)
--- a/str2host.c
+++ b/str2host.c
@@ -419,6 +419,7 @@ ldns_str2rdf_str(ldns_rdf **rd, const char *str)
        data = LDNS_XMALLOC(uint8_t, strlen(str) + 1);
         if(!data) return LDNS_STATUS_MEM_ERR;
        i = 1;
+
        for (str_i = 0; str_i < strlen(str); str_i++) {
                if (str[str_i] == '\\') {
                        /* octet value or literal char */
@@ -435,6 +436,7 @@ ldns_str2rdf_str(ldns_rdf **rd, const char *str)
        }
        data[0] = i - 1;
        *rd = ldns_rdf_new_frm_data(LDNS_RDF_TYPE_STR, i, data);
+
        LDNS_FREE(data);
        return *rd?LDNS_STATUS_OK:LDNS_STATUS_MEM_ERR;
 }