@@ -127,9 +127,13 @@ static int cli_bytecode_context_reset(struct cli_bc_ctx *ctx)

     ctx->operands = NULL;

     if (ctx->outfd) {

+	cli_ctx *cctx = ctx->ctx;

 	cli_bcapi_extract_new(ctx, -1);

 	if (ctx->outfd)

 	    close(ctx->outfd);

+	if (ctx->tempfile && (!cctx || !cctx->engine->keeptmp)) {

+	    cli_unlink(ctx->tempfile);

+	}

 	free(ctx->tempfile);

 	ctx->tempfile = NULL;

 	ctx->outfd = 0;

@@ -210,9 +214,6 @@ static int cli_bytecode_context_reset(struct cli_bc_ctx *ctx)

 int cli_bytecode_context_clear(struct cli_bc_ctx *ctx)

 {

     cli_ctx *cctx = (cli_ctx*)ctx->ctx;

-    if (ctx->tempfile && (!cctx || !cctx->engine->keeptmp)) {

-	cli_unlink(ctx->tempfile);

-    }

     cli_bytecode_context_reset(ctx);

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

     return CL_SUCCESS;

@@ -579,17 +579,21 @@ int cli_cvdload(FILE *fs, struct cl_engine *engine, unsigned int *signo, unsigne

     if(!access(dupname, R_OK) && (dupfs = fopen(dupname, "rb"))) {

 	if((ret = cli_cvdverify(dupfs, &dupcvd, !cld))) {

 	    fclose(dupfs);

+	    free(dupname);

 	    return ret;

 	}

 	fclose(dupfs);

 	if(dupcvd.version > cvd.version) {

 	    cli_warnmsg("Detected duplicate databases %s and %s. The %s database is older and will not be loaded, you should manually remove it from the database directory.\n", filename, dupname, filename);

+	    free(dupname);

 	    return CL_SUCCESS;

 	} else if(dupcvd.version == cvd.version && !cld) {

 	    cli_warnmsg("Detected duplicate databases %s and %s, please manually remove one of them\n", filename, dupname);

+	    free(dupname);

 	    return CL_SUCCESS;

 	}

     }

+    free(dupname);

     if(strstr(filename, "daily.")) {

 	time(&s_time);