aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorMichael Scheidell <scheidell@FreeBSD.org>2012-06-22 19:25:41 +0000
committerMichael Scheidell <scheidell@FreeBSD.org>2012-06-22 19:25:41 +0000
commitab9173024db98561dbf4561eb6652488b6cf9e31 (patch)
treee54ba986131a8ca9c9aed37eeba2ca438aa03ed0 /security
parent149dcdb0abbaae9b81dd6369360ce244f43bf5ea (diff)
downloadports-ab9173024db98561dbf4561eb6652488b6cf9e31.tar.gz
ports-ab9173024db98561dbf4561eb6652488b6cf9e31.zip
Notes
Diffstat (limited to 'security')
-rw-r--r--security/clamav/Makefile1
-rw-r--r--security/clamav/files/patch-libclamav__scanners.c_bug_525223
2 files changed, 24 insertions, 0 deletions
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 6bf7ae40ef71..7759bdc356f6 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -7,6 +7,7 @@
PORTNAME= clamav
PORTVERSION= 0.97.5
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF
diff --git a/security/clamav/files/patch-libclamav__scanners.c_bug_5252 b/security/clamav/files/patch-libclamav__scanners.c_bug_5252
new file mode 100644
index 000000000000..6a21dedb24ef
--- /dev/null
+++ b/security/clamav/files/patch-libclamav__scanners.c_bug_5252
@@ -0,0 +1,23 @@
+--- libclamav/scanners.c.orig
++++ libclamav/scanners.c
+@@ -2369,7 +2369,19 @@ static int magic_scandesc(cli_ctx *ctx, cli_file_t type)
+ ret = res;
+ cli_bitset_free(ctx->hook_lsig_matches);
+ ctx->hook_lsig_matches = old_hook_lsig_matches;
+- ret_from_magicscan(ret);
++ /* Same switch as end of magic_scandesc function */
++ switch(ret) {
++ case CL_EFORMAT:
++ case CL_EMAXREC:
++ case CL_EMAXSIZE:
++ case CL_EMAXFILES:
++ cli_dbgmsg("Descriptor: %s\n", cl_strerror(ret));
++ case CL_CLEAN: /* here, only from cli_checkfp() */
++ cache_add(hash, hashed_size, ctx);
++ ret_from_magicscan(CL_CLEAN);
++ default:
++ ret_from_magicscan(ret);
++ }
+ }
+ }
+