@@ -1,3 +1,8 @@

+Mon Jun  2 17:59:15 EEST 2008 (edwin)

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

+  * libclamav/hashtab.[ch], scanners.c: avoid using C99 flexible array members

+  (bb #1039)

+

 Mon Jun  2 14:57:31 CEST 2008 (tk)

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

   * freshclam: in interactive mode EXIT_n can be passed to --on-*-execute

@@ -562,9 +562,14 @@ ssize_t hashset_toarray(const struct hashset* hs, uint32_t** array)

 struct uniq *uniq_init(uint32_t count) {

 	struct uniq *U;

 	if(!count) return NULL;

- 	count = count <= 256 ? 256 : count + (count*20/100);

-	U = (struct uniqueid *)cli_calloc(1, sizeof(U)+sizeof(uint32_t)*count);

+	count = count <= 256 ? 256 : count + (count*20/100);

+	U = cli_malloc(sizeof(*U));

 	if(!U) return NULL;

+	U->uniques = cli_calloc(count, sizeof(uint32_t));

+	if(!U->uniques) {

+		free(U);

+		return NULL;

+	}

 	U->count = count;

 	return U;

 }

@@ -109,11 +109,11 @@ ssize_t hashset_toarray(const struct hashset* hs, uint32_t** array);

 /* A basic storage for unique IDs */

 struct uniq {

 	uint32_t count;

-        uint32_t uniques[];

+        uint32_t *uniques;

 };

 struct uniq *uniq_init(uint32_t);

-#define uniq_free(X) free(X);

+#define uniq_free(X) do { if(X) free(X->uniques); free(X); } while (0)

 uint32_t uniq_add(struct uniq *, const char *, uint32_t, uint32_t *);

 uint32_t uniq_get(struct uniq *, const char *, uint32_t, uint32_t *);

@@ -1124,7 +1124,7 @@ static int cli_scanole2(int desc, cli_ctx *ctx)

         ctx->recursion++;

 	ret = cli_vba_scandir(dir, ctx, vba);

-	free(vba);

+	uniq_free(vba);

 	if(ret != CL_VIRUS)

 	    if(cli_scandir(dir, ctx, 0) == CL_VIRUS)

 	        ret = CL_VIRUS;