@@ -110,7 +110,7 @@ static int cli_bytecode_context_reset(struct cli_bc_ctx *ctx)

 int cli_bytecode_context_clear(struct cli_bc_ctx *ctx)

 {

     cli_bytecode_context_reset(ctx);

-    memset(ctx, 0, sizeof(ctx));

+    memset(ctx, 0, sizeof(*ctx));

     return CL_SUCCESS;

 }

@@ -722,13 +722,16 @@ void cache_add(unsigned char *md5, size_t size, cli_ctx *ctx) {

 /* Hashes a file onto the provided buffer and looks it up the cache.

    Returns CL_VIRUS if found, CL_CLEAN if not FIXME or an error */

 int cache_check(unsigned char *hash, cli_ctx *ctx) {

-    fmap_t *map = *ctx->fmap;

-    size_t todo = map->len, at = 0;

+    fmap_t *map;

+    size_t todo, at = 0;

     cli_md5_ctx md5;

     if(!ctx || !ctx->engine || !ctx->engine->cache)

        return CL_VIRUS;

+    map = *ctx->fmap;

+    todo = map->len;

+

     cli_md5_init(&md5);

     while(todo) {

 	void *buf;

@@ -1173,12 +1173,14 @@ static int parseicon(icon_groupset *set, uint32_t rva, cli_ctx *ctx, struct cli_

     unsigned int scanlinesz, andlinesz;

     unsigned int width, height, depth, x, y;

     unsigned int err, scalemode = 2, enginesize;

-    fmap_t *map = *ctx->fmap;

-    uint32_t icoff = cli_rawaddr(rva, exe_sections, nsections, &err, map->len, hdr_size);

+    fmap_t *map;

+    uint32_t icoff;

     struct icon_matcher *matcher;

     if(!ctx || !ctx->engine || !(matcher=ctx->engine->iconcheck))

 	return CL_SUCCESS;

+    map = *ctx->fmap;

+    icoff = cli_rawaddr(rva, exe_sections, nsections, &err, map->len, hdr_size);

     /* read the bitmap header */

     if(err || !(imagedata = fmap_need_off_once(map, icoff, 4))) {