@@ -23,6 +23,8 @@

 #include "str.h"

 #include <string.h>

+#include <stdlib.h>

+

 int hm_addhash(struct cli_matcher *root, const char *hash, uint32_t size, const char *virusname) {

     const struct cli_htu32_element *item;

@@ -126,9 +128,9 @@ static const unsigned int hashlen[] = {

 static inline int hm_cmp(const uint8_t *itm, const uint8_t *ref, unsigned int keylen) {

-    uint32_t i = *(uint32_t *)itm, r = *(uint32_t *)ref; /* safely aligned and faster than memcmp */

-    if(i != r) 

-	return (int)(i - r);

+    uint32_t i = *(uint32_t *)itm, r = *(uint32_t *)ref;

+    if(i!=r)

+	return (i<r) * 2 -1;

     return memcmp(&itm[4], &ref[4], keylen - 4);

 }

@@ -138,7 +140,7 @@ void hm_sort(struct cli_sz_hash *szh, size_t l, size_t r, unsigned int keylen) {

     const char *tmpv;

-    if(l > r - 1)

+    if(l + 1 >= r)

 	return;

     l1 = l+1, r1 = r;

@@ -158,17 +160,20 @@ void hm_sort(struct cli_sz_hash *szh, size_t l, size_t r, unsigned int keylen) {

     }

     l1--;

-    memcpy(tmph, &szh->hash_array[keylen * l1], keylen);

-    tmpv = szh->virusnames[l1];

-    memcpy(&szh->hash_array[keylen * l1], &szh->hash_array[keylen * l], keylen);

-    szh->virusnames[l1] = szh->virusnames[l];

-    memcpy(&szh->hash_array[keylen * l], tmph, keylen);

-    szh->virusnames[l] = tmpv;

+    if(l1!=l) {

+	memcpy(tmph, &szh->hash_array[keylen * l1], keylen);

+	tmpv = szh->virusnames[l1];

+	memcpy(&szh->hash_array[keylen * l1], &szh->hash_array[keylen * l], keylen);

+	szh->virusnames[l1] = szh->virusnames[l];

+	memcpy(&szh->hash_array[keylen * l], tmph, keylen);

+	szh->virusnames[l] = tmpv;

+    }

     hm_sort(szh, l, l1, keylen);

     hm_sort(szh, r1, r, keylen);

 }

+

 void hm_flush(struct cli_matcher *root) {

     enum CLI_HASH_TYPE type;

@@ -201,10 +206,7 @@ void hm_flush(struct cli_matcher *root) {

 int cli_hm_have_size(const struct cli_matcher *root, enum CLI_HASH_TYPE type, uint32_t size) {

-    if(!size || size == 0xffffffff || !root || !root->hm.htinint[type] || !cli_htu32_find(&root->hm.sizehashes[type], size))

-	return 0;

-

-    return 1;

+    return (size && size != 0xffffffff && root && root->hm.htinint[type] && cli_htu32_find(&root->hm.sizehashes[type], size));

 }

 int cli_hm_scan(const unsigned char *digest, uint32_t size, const char **virname, const struct cli_matcher *root, enum CLI_HASH_TYPE type) {

@@ -225,14 +227,16 @@ int cli_hm_scan(const unsigned char *digest, uint32_t size, const char **virname

     l = 0;

     r = szh->items;

-    while(l < r) {

+    while(l <= r) {

 	size_t c = (l + r) / 2;

 	int res = hm_cmp(digest, &szh->hash_array[keylen * c], keylen);

-	if(res < 0)

-	    r = c;

-	else if(res > 0)

-	    l = c;

+	if(res < 0) {

+	    if(!c)

+		break;

+	    r = c - 1;

+	} else if(res > 0)

+	    l = c + 1;

 	else {

 	    if(virname)

 		*virname = szh->virusnames[c];

@@ -651,7 +651,7 @@ int cli_fmap_scandesc(cli_ctx *ctx, cli_file_t ftype, uint8_t ftonly, struct cli

 	}

     }

-    if(!refhash && !ftonly && ctx->engine->md5_hdb)

+    if(!refhash && !ftonly && (ctx->engine->md5_hdb || ctx->engine->hm_hdb))

 	cli_md5_init(&md5ctx);

     while(offset < map->len) {

@@ -696,7 +696,7 @@ int cli_fmap_scandesc(cli_ctx *ctx, cli_file_t ftype, uint8_t ftonly, struct cli

 		    type = ret;

 	    }

-	    if(!refhash && ctx->engine->md5_hdb)

+	    if(!refhash && (ctx->engine->md5_hdb || ctx->engine->hm_hdb))

 		cli_md5_update(&md5ctx, buff + maxpatlen * (offset!=0), bytes - maxpatlen * (offset!=0));

 	}