Merge pull request #435 from yschaeff/coverity

Coverity
opendnssec · May 25, 2016 · 399f0a4 · 399f0a4
2 parents d97ea93 + 5c9b6a1
commit 399f0a4
Show file tree

Hide file tree

Showing 13 changed files with 248 additions and 206 deletions.
diff --git a/enforcer/src/db/db_backend_sqlite.c b/enforcer/src/db/db_backend_sqlite.c
@@ -1872,6 +1872,8 @@ db_backend_handle_t* db_backend_sqlite_new_handle(void) {
             free(backend_sqlite);
             return NULL;
         }
+        return backend_handle;
     }
-    return backend_handle;
+    free(backend_sqlite);
+    return NULL;
 }
diff --git a/enforcer/src/db/zone.c b/enforcer/src/db/zone.c
@@ -2277,6 +2277,7 @@ static int zone_list_get_associated(zone_list_t* zone_list) {
         || key_dependency_list_get_by_clauses(key_dependency_list, clause_list))
     {
         key_dependency_list_free(key_dependency_list);
+	key_data_list_free(key_data_list);
         db_clause_list_free(clause_list);
         return DB_ERROR_UNKNOWN;
     }

diff --git a/enforcer/src/enforcer/repositorylist_cmd.c b/enforcer/src/enforcer/repositorylist_cmd.c
@@ -47,7 +47,7 @@ perform_repositorylist(int sockfd)
 
 	const char *fmt = "%-31s %-13s %-13s\n";
 	char *capacity = NULL;
-	char *backup = NULL;
+	int backup;
 	char *repository = NULL;
 	int i;
 
@@ -84,19 +84,17 @@ perform_repositorylist(int sockfd)
 			curNode = xpathObj->nodesetval->nodeTab[i]->xmlChildrenNode;
 			repository = (char*)xmlGetProp(xpathObj->nodesetval->nodeTab[i], (const xmlChar *)"name");
 
+			backup = 0;
 			while (curNode) {
 				if (xmlStrEqual(curNode->name, (const xmlChar *)"Capacity"))
 					capacity = (char*) xmlNodeGetContent(curNode);
-				if (xmlStrEqual(curNode->name, (const xmlChar *)"RequireBackup")){
-                                        backup = strdup("Yes");
-				}
+				if (xmlStrEqual(curNode->name, (const xmlChar *)"RequireBackup"))
+					backup = 1;
 				curNode = curNode->next;
 			}
-			client_printf(sockfd, fmt, repository, capacity?capacity:"-", backup?backup:"No");
+			client_printf(sockfd, fmt, repository, capacity?capacity:"-", backup?"Yes":"No");
 			free(repository);
 			repository = NULL;
-			free(backup);
-			backup = NULL;
 			free(capacity);
 			capacity = NULL;
 		}