[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

aCaB acab at clamav.net
Sun Apr 4 01:13:43 UTC 2010


The following commit has been merged in the debian/unstable branch:
commit 91689e9b5e59f53de35f1a2f580125036dd9fa71
Author: aCaB <acab at clamav.net>
Date:   Mon Jan 4 18:10:23 2010 +0100

    bzero size typo in hs

diff --git a/libclamav/hashtab.c b/libclamav/hashtab.c
index e50530c..d8f19be 100644
--- a/libclamav/hashtab.c
+++ b/libclamav/hashtab.c
@@ -444,8 +444,6 @@ int cli_hashset_init(struct cli_hashset* hs, size_t initial_capacity, uint8_t lo
 
 void cli_hashset_destroy(struct cli_hashset* hs)
 {
-	if (!hs->keys)
-	    return;
 	cli_dbgmsg(MODULE_NAME "Freeing hashset, elements: %u, capacity: %u\n", hs->count, hs->capacity);
 	free(hs->keys);
 	free(hs->bitmap);
@@ -560,7 +558,7 @@ ssize_t cli_hashset_toarray(const struct cli_hashset* hs, uint32_t** array)
 
 void cli_hashset_init_noalloc(struct cli_hashset *hs)
 {
-    memset(hs, 0, sizeof(hs));
+    memset(hs, 0, sizeof(*hs));
 }
 
 int cli_hashset_contains_maybe_noalloc(const struct cli_hashset *hs, const uint32_t key)

-- 
Debian repository for ClamAV



More information about the Pkg-clamav-commits mailing list