2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00

[master] silence ccc-analyzer

3567.	[bug]		Silence clang static analyzer warnings. [RT #33365]
This commit is contained in:
Evan Hunt
2013-05-03 14:22:47 -07:00
parent 34f3693b93
commit e47208b6fb
5 changed files with 13 additions and 5 deletions

View File

@@ -1,3 +1,5 @@
3567. [bug] Silence clang static analyzer warnings. [RT #33365]
3566. [func] Log when forwarding updates to master. [RT #33240] 3566. [func] Log when forwarding updates to master. [RT #33240]
3564. [bug] Improved handling of corrupted map files. [RT #33380] 3564. [bug] Improved handling of corrupted map files. [RT #33380]

View File

@@ -535,6 +535,7 @@ main(int argc, char **argv) {
"recommended.\nIf you still wish to " "recommended.\nIf you still wish to "
"use RSA (RSAMD5) please specify " "use RSA (RSAMD5) please specify "
"\"-a RSAMD5\"\n"); "\"-a RSAMD5\"\n");
INSIST(freeit == NULL);
return (1); return (1);
} else if (strcasecmp(algname, "HMAC-MD5") == 0) } else if (strcasecmp(algname, "HMAC-MD5") == 0)
alg = DST_ALG_HMACMD5; alg = DST_ALG_HMACMD5;

View File

@@ -6605,6 +6605,7 @@ zone_from_args(ns_server_t *server, char *args, const char *zonetxt,
dns_rdataclass_t rdclass; dns_rdataclass_t rdclass;
REQUIRE(zonep != NULL && *zonep == NULL); REQUIRE(zonep != NULL && *zonep == NULL);
REQUIRE(zonename == NULL || *zonename == NULL);
input = args; input = args;
@@ -6620,7 +6621,7 @@ zone_from_args(ns_server_t *server, char *args, const char *zonetxt,
zonetxt = next_token(&input, " \t"); zonetxt = next_token(&input, " \t");
if (zonetxt == NULL) if (zonetxt == NULL)
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
if (zonename) if (zonename != NULL)
*zonename = zonetxt; *zonename = zonetxt;
/* Look for the optional class name. */ /* Look for the optional class name. */
@@ -8510,8 +8511,8 @@ ns_server_del_zone(ns_server_t *server, char *args, isc_buffer_t *text) {
goto cleanup; goto cleanup;
} }
if (zonename != NULL) INSIST(zonename != NULL);
znamelen = strlen(zonename); znamelen = strlen(zonename);
/* Dig out configuration for this zone */ /* Dig out configuration for this zone */
view = dns_zone_getview(zone); view = dns_zone_getview(zone);

View File

@@ -2628,6 +2628,10 @@ isspf(const dns_rdata_t *rdata) {
data += tl; data += tl;
rdl -= tl; rdl -= tl;
} }
if (i < 6U)
return(ISC_FALSE);
buf[i] = 0; buf[i] = 0;
if (strncmp(buf, "v=spf1", 6) == 0 && (buf[6] == 0 || buf[6] == ' ')) if (strncmp(buf, "v=spf1", 6) == 0 && (buf[6] == 0 || buf[6] == ' '))
return (ISC_TRUE); return (ISC_TRUE);

View File

@@ -375,10 +375,10 @@ isc__app_ctxstart(isc_appctx_t *ctx0) {
cleanup: cleanup:
#ifdef ISC_PLATFORM_USETHREADS #ifdef ISC_PLATFORM_USETHREADS
cleanup_rcond: cleanup_rcond:
isc_condition_destroy(&ctx->ready); (void)isc_condition_destroy(&ctx->ready);
cleanup_rlock: cleanup_rlock:
isc_mutex_destroy(&ctx->readylock); (void)isc_mutex_destroy(&ctx->readylock);
#endif /* ISC_PLATFORM_USETHREADS */ #endif /* ISC_PLATFORM_USETHREADS */
return (result); return (result);
} }