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

+Mon Apr 28 16:13:33 CEST 2008 (tk)

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

+  * libclamav/scanners.c: don't return CL_EMAX* error codes to

+			  applications (bb#1001)

+

 Mon Apr 28 13:48:36 CEST 2008 (tk)

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

   * clamscan/manager.c: print information about clean files when the RAR

@@ -37,9 +37,9 @@ extern "C"

 #define CL_SUCCESS	CL_CLEAN

 #define CL_BREAK	2

-#define CL_EMAXREC	-100 /* recursion limit exceeded */

-#define CL_EMAXSIZE	-101 /* size limit exceeded */

-#define CL_EMAXFILES	-102 /* files limit exceeded */

+#define CL_EMAXREC	-100 /* (internal) recursion limit exceeded */

+#define CL_EMAXSIZE	-101 /* (internal) size limit exceeded */

+#define CL_EMAXFILES	-102 /* (internal) files limit exceeded */

 #define CL_ERAR		-103 /* rar handler error */

 #define CL_EZIP		-104 /* zip handler error */

 #define CL_EGZIP	-105 /* gzip handler error */

@@ -61,7 +61,7 @@ extern "C"

 #define CL_EMD5		-121 /* MD5 verification error */

 #define CL_EDSIG	-122 /* digital signature verification error */

 #define CL_EIO		-123 /* general I/O error */

-#define CL_EFORMAT	-124 /* bad format or broken file */

+#define CL_EFORMAT	-124 /* (internal) bad format or broken file */

 #define CL_ESUPPORT	-125 /* not supported data format */

 #define CL_ELOCKDB	-126 /* can't lock DB directory */

 #define CL_EARJ         -127 /* ARJ handler error */

@@ -2040,11 +2040,15 @@ int cli_magic_scandesc(int desc, cli_ctx *ctx)

     }

     ctx->recursion--;

-    if(ret == CL_EFORMAT) {

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

-	return CL_CLEAN;

-    } else {

-	return ret;

+    switch(ret) {

+	case CL_EFORMAT:

+	case CL_EMAXREC:

+	case CL_EMAXSIZE:

+	case CL_EMAXFILES:

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

+	    return CL_CLEAN;

+	default:

+	    return ret;

     }

 }