diff --git a/bin/named/server.c b/bin/named/server.c
index bc1e76e951..d65f09bfe0 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -1324,10 +1324,8 @@ check_dbtype(dns_zone_t *zone, unsigned int dbtypec, const char **dbargv,
 	 * Check that all the arguments match.
 	 */
 	for (i = 0; i < dbtypec; i++)
-		if (argv[i] == NULL || strcmp(argv[i], dbargv[i]) != 0) {
+		if (argv[i] == NULL || strcmp(argv[i], dbargv[i]) != 0)
 			CHECK(ISC_R_FAILURE);
-			break;
-		}
 
 	/*
 	 * Check that there are not extra arguments.
diff --git a/bin/tests/names/t_names.c b/bin/tests/names/t_names.c
index 9a87e6fd8f..79f392a42b 100644
--- a/bin/tests/names/t_names.c
+++ b/bin/tests/names/t_names.c
@@ -823,7 +823,6 @@ t_dns_name_fullcompare(void) {
 	if (fp != NULL) {
 		line = 0;
 		while ((p = t_fgetbs(fp)) != NULL) {
-
 			++line;
 
 			/*
@@ -851,8 +850,8 @@ t_dns_name_fullcompare(void) {
 				else if (!strcmp(Tokens[2], "commonancestor"))
 					reln = dns_namereln_commonancestor;
 				else {
-					t_info("bad format at line %d\n",
-					       line);
+					t_info("bad format at line %d\n", line);
+					(void)free(p);
 					continue;
 				}
 				result = test_dns_name_fullcompare(