@@ -2361,26 +2361,38 @@ static int magic_scandesc(int desc, cli_ctx *ctx, cli_file_t type)

     if(type != CL_TYPE_IGNORED && (type != CL_TYPE_HTML || !(DCONF_DOC & DOC_CONF_HTML_SKIPRAW)) && !ctx->engine->sdb) {

 	res = cli_scanraw(ctx, type, typercg, &dettype, hash);

 	if(res != CL_CLEAN) {

-	    if(res == CL_VIRUS)

-		ret =  cli_checkfp(hash, hashed_size, ctx);

-	    else

-		ret = res;

-	    funmap(*ctx->fmap);

-	    ctx->fmap--;

-	    cli_bitset_free(ctx->hook_lsig_matches);

-	    ctx->hook_lsig_matches = old_hook_lsig_matches;

-	    /* Same switch as end of magic_scandesc function */

-	    switch(ret) {

-		case CL_EFORMAT:

+	    switch(res) {

+		/* Short list of scan halts, major runtime errors only! */

+		case CL_EREAD:

+		case CL_ESEEK:

+		case CL_EMEM:

+		    cli_dbgmsg("Descriptor[%d]: cli_scanraw error %s\n", desc, cl_strerror(res));

+		    funmap(*ctx->fmap);

+		    ctx->fmap--;

+		    cli_bitset_free(ctx->hook_lsig_matches);

+		    ctx->hook_lsig_matches = old_hook_lsig_matches;

+		    ret_from_magicscan(res);

+		/* CL_VIRUS = malware found, check FP and report */

+		case CL_VIRUS:

+		    ret = cli_checkfp(hash, hashed_size, ctx);

+		    funmap(*ctx->fmap);

+		    ctx->fmap--;

+		    cli_bitset_free(ctx->hook_lsig_matches);

+		    ctx->hook_lsig_matches = old_hook_lsig_matches;

+		    ret_from_magicscan(ret);

+		/* "MAX" conditions should still fully scan the current file */

 		case CL_EMAXREC:

 		case CL_EMAXSIZE:

 		case CL_EMAXFILES:

-		    cli_dbgmsg("Descriptor[%d]: %s\n", desc, cl_strerror(ret));

-		case CL_CLEAN: /* here, only from cli_checkfp() */

-		    cache_add(hash, hashed_size, ctx);

-		    ret_from_magicscan(CL_CLEAN);

+		    ret = res;

+		    cli_dbgmsg("Descriptor[%d]: Continuing after cli_scanraw reached %s\n",

+			desc, cl_strerror(res));

+		    break;

+		/* Other errors should not prevent later attempts to scan */

 		default:

-		    ret_from_magicscan(ret);

+		    ret = res;

+		    cli_dbgmsg("Descriptor[%d]: Continuing after cli_scanraw error %s\n",

+			desc, cl_strerror(res));

 	    }

 	}

     }