Browse code

bb#2818

aCaB authored on 2011/05/26 21:20:57
Showing 2 changed files
... ...
@@ -1,3 +1,7 @@
1
+Thu May 26 14:17:52 CEST 2011 (acab)
2
+------------------------------------
3
+ * libclamav/matcher-hash.c: in hm_sort don't swap an item with itself (bb#2818)
4
+
1 5
 Thu May 12 13:01:56 CEST 2011 (tk)
2 6
 ----------------------------------
3 7
  * freshclam/manager.c: fix return code of Rfc2822DateTime() (bb#2809)
... ...
@@ -148,6 +148,7 @@ static void hm_sort(struct cli_sz_hash *szh, size_t l, size_t r, unsigned int ke
148 148
     while(l1 < r1) {
149 149
 	if(hm_cmp(&szh->hash_array[keylen * l1], piv, keylen) > 0) {
150 150
 	    r1--;
151
+	    if(l1 == r1) break;
151 152
 	    memcpy(tmph, &szh->hash_array[keylen * l1], keylen);
152 153
 	    tmpv = szh->virusnames[l1];
153 154
 	    memcpy(&szh->hash_array[keylen * l1], &szh->hash_array[keylen * r1], keylen);