From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 20 Aug 2013 14:14:08 +0000 (+0000)
Subject: review fixes.
X-Git-Tag: release-1.4.21^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de07375a9c8109a137ef0633f20ecb103bfbc865;p=thirdparty%2Funbound.git

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 51f3e2ea2..572f701f3 100644
--- 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 9191e1f7c..d3b081342 100644
--- 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;
 	}