review fixes.

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

diff --git a/iterator/iter_priv.c b/iterator/iter_priv.c
index 51f3e2ea2ffb20cafb4dc75020a80d8a451be0e9..572f701f350da001187ec23bcc07e747887bc86c 100644 (file)
--- a/iterator/iter_priv.c
+++ b/iterator/iter_priv.c
@@ -213,7 +213,7 @@ static int
 remove_rr(const char* str, ldns_buffer* pkt, struct rrset_parse* rrset,
        struct rr_parse* prev, struct rr_parse** rr, struct sockaddr_storage* addr, socklen_t addrlen)
 {
-       if(verbosity >= VERB_QUERY && rrset->dname_len <= LDNS_MAX_DOMAINLEN) {
+       if(verbosity >= VERB_QUERY && rrset->dname_len <= LDNS_MAX_DOMAINLEN && str) {
                uint8_t buf[LDNS_MAX_DOMAINLEN+1];
                dname_pkt_copy(pkt, buf, rrset->dname);
                log_name_addr(VERB_QUERY, str, buf, addr, addrlen);

diff --git a/util/configlexer.lex b/util/configlexer.lex
index 9191e1f7cc47d259a072f4dcc509ef02664b90dd..d3b0813420117e5c97f89ba862f2ce529ee1f2a4 100644 (file)
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -79,7 +79,7 @@ static void config_start_include(const char* filename)
        }
        nm = strdup(filename);
        if(!nm) {
-               ub_c_error_msg("include %s: malloc failure", filename);
+               ub_c_error_msg("include %s: strdup failure", filename);
                free(s);
                return;
        }