From: Evan Hunt <each@isc.org>
Date: Fri, 3 May 2013 21:23:20 +0000 (-0700)
Subject: [v9_9] silence ccc-analyzer
X-Git-Tag: v9.9.3~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d07ede4cd629a6158732a808a88a4843ab1db902;p=thirdparty%2Fbind9.git

[v9_9] silence ccc-analyzer

3567.	[bug]		Silence clang static analyzer warnings. [RT #33365]
---

diff --git a/CHANGES b/CHANGES
index 06530b5a321..8f9b953318c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3567.	[bug]		Silence clang static analyzer warnings. [RT #33365]
+
 3563.	[contrib]	zone2sqlite failed with some table names. [RT #33375]
 
 3561.	[bug]		dig: issue a warning if an EDNS query returns FORMERR
diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 5a30ca55b74..1e61ca392e8 100644
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -535,6 +535,7 @@ main(int argc, char **argv) {
 					"recommended.\nIf you still wish to "
 					"use RSA (RSAMD5) please specify "
 					"\"-a RSAMD5\"\n");
+			INSIST(freeit == NULL);
 			return (1);
 		} else if (strcasecmp(algname, "HMAC-MD5") == 0)
 			alg = DST_ALG_HMACMD5;
diff --git a/bin/named/server.c b/bin/named/server.c
index 4d9126c9166..aef922bb73b 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -6130,6 +6130,7 @@ zone_from_args(ns_server_t *server, char *args, const char *zonetxt,
 	dns_rdataclass_t rdclass;
 
 	REQUIRE(zonep != NULL && *zonep == NULL);
+	REQUIRE(zonename == NULL || *zonename == NULL);
 
 	input = args;
 
@@ -6145,7 +6146,7 @@ zone_from_args(ns_server_t *server, char *args, const char *zonetxt,
 		zonetxt = next_token(&input, " \t");
 	if (zonetxt == NULL)
 		return (ISC_R_SUCCESS);
-	if (zonename)
+	if (zonename != NULL)
 		*zonename = zonetxt;
 
 	/* Look for the optional class name. */
@@ -7954,8 +7955,8 @@ ns_server_del_zone(ns_server_t *server, char *args) {
 		goto cleanup;
 	}
 
-	if (zonename != NULL)
-		znamelen = strlen(zonename);
+	INSIST(zonename != NULL);
+	znamelen = strlen(zonename);
 
 	/* Dig out configuration for this zone */
 	view = dns_zone_getview(zone);
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index a60ee79b94b..10ba807c52f 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -2490,6 +2490,10 @@ isspf(const dns_rdata_t *rdata) {
 		data += tl;
 		rdl -= tl;
 	}
+
+	if (i < 6U)
+		return(ISC_FALSE);
+
 	buf[i] = 0;
 	if (strncmp(buf, "v=spf1", 6) == 0 && (buf[6] == 0 || buf[6] == ' '))
 		return (ISC_TRUE);