@@ -1,3 +1,7 @@

+Thu Mar 10 15:54:05 CET 2011 (tk)

+---------------------------------

+ * libclamav: optimize handling of {n} wildcards (bb#1796)

+

 Wed Mar  9 15:42:50 CET 2011 (tk)

 ---------------------------------

  * clamdscan: fix file exclusion (bb#2579)

@@ -112,8 +112,9 @@ char *cli_virname(char *virname, unsigned int official)

 int cli_parse_add(struct cli_matcher *root, const char *virname, const char *hexsig, uint16_t rtype, uint16_t type, const char *offset, uint8_t target, const uint32_t *lsigid, unsigned int options)

 {

 	struct cli_bm_patt *bm_new;

-	char *pt, *hexcpy, *start, *n;

-	int ret, asterisk = 0;

+	char *pt, *hexcpy, *start, *n, l, r;

+	const char *wild;

+	int ret, asterisk = 0, range;

 	unsigned int i, j, hexlen, parts = 0;

 	int mindist = 0, maxdist = 0, error = 0;

@@ -162,7 +163,24 @@ int cli_parse_add(struct cli_matcher *root, const char *virname, const char *hex

 	}

 	return CL_SUCCESS;

     }

-    if(strchr(hexsig, '{')) {

+    if((wild = strchr(hexsig, '{'))) {

+	if(sscanf(wild, "%c%u%c", &l, &range, &r) == 3 && l == '{' && r == '}' && range > 0 && range < 128) {

+	    hexcpy = cli_calloc(hexlen + 2 * range, sizeof(char));

+	    if(!hexcpy)

+		return CL_EMEM;

+	    strncpy(hexcpy, hexsig, wild - hexsig);

+	    for(i = 0; i < (unsigned int) range; i++)

+		strcat(hexcpy, "??");

+	    if(!(wild = strchr(wild, '}'))) {

+		cli_errmsg("cli_parse_add(): Problem adding signature: missing bracket\n");

+		free(hexcpy);

+		return CL_EMALFDB;

+	    }

+	    strcat(hexcpy, ++wild);

+	    ret = cli_parse_add(root, virname, hexcpy, rtype, type, offset, target, lsigid, options);

+	    free(hexcpy);

+	    return ret;

+	}

 	root->ac_partsigs++;