[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 12876d3cb63db8adbbbb0cfb86113f9610d48180
Author: Török Edvin <edwin at clamav.net>
Date:   Wed Mar 24 18:34:58 2010 +0200

    bytecode timeout 60s.

diff --git a/etc/clamd.conf b/etc/clamd.conf
index d5a5a44..02cbaf6 100644
--- a/etc/clamd.conf
+++ b/etc/clamd.conf
@@ -467,5 +467,5 @@ Example
 
 # Set bytecode timeout in miliseconds.
 # 
-# Default: 5000
-# BytecodeTimeout 5000
+# Default: 60000
+# BytecodeTimeout 60000
diff --git a/libclamav/bytecode.c b/libclamav/bytecode.c
index d6d93b4..dfa8937 100644
--- a/libclamav/bytecode.c
+++ b/libclamav/bytecode.c
@@ -68,7 +68,7 @@ static void context_safe(struct cli_bc_ctx *ctx)
 struct cli_bc_ctx *cli_bytecode_context_alloc(void)
 {
     struct cli_bc_ctx *ctx = cli_calloc(1, sizeof(*ctx));
-    ctx->bytecode_timeout = 5000;
+    ctx->bytecode_timeout = 60000;
     return ctx;
 }
 
diff --git a/libclamav/others.c b/libclamav/others.c
index 1ac6bc6..efdcea6 100644
--- a/libclamav/others.c
+++ b/libclamav/others.c
@@ -300,7 +300,7 @@ struct cl_engine *cl_engine_new(void)
 
     new->bytecode_security = CL_BYTECODE_TRUST_SIGNED;
     /* 5 seconds timeout */
-    new->bytecode_timeout = 5000000;
+    new->bytecode_timeout = 60000;
     new->refcount = 1;
     new->ac_only = 0;
     new->ac_mindepth = CLI_DEFAULT_AC_MINDEPTH;
diff --git a/shared/optparser.c b/shared/optparser.c
index bbf17b3..1488cd8 100644
--- a/shared/optparser.c
+++ b/shared/optparser.c
@@ -250,8 +250,8 @@ const struct clam_option __clam_options[] = {
     { "Bytecode", "bytecode", 0, TYPE_BOOL, MATCH_BOOL, 1, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "With this option enabled ClamAV will load bytecode from the database. It is highly recommended you keep this option on, otherwise you'll miss detections for many new viruses.", "yes" },
     { "BytecodeSecurity", NULL, 0, TYPE_STRING, "^(None|TrustSigned|Paranoid)$", -1, "TrustSigned", 0, OPT_CLAMD, 
 	"Set bytecode security level.\nPossible values:\n\tNone - no security at all, meant for debugging. DO NOT USE THIS ON PRODUCTION SYSTEMS\n\tTrustSigned - trust bytecode loaded from signed .c[lv]d files,\n\t\t insert runtime safety checks for bytecode loaded from other sources\n\tParanoid - don't trust any bytecode, insert runtime checks for all\nRecommended: TrustSigned, because bytecode in .cvd files already has these checks\n","TrustSigned"},
-    { "BytecodeTimeout", "bytecode-timeout", 0, TYPE_NUMBER, MATCH_NUMBER, 5000, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, 
-	"Set bytecode timeout in miliseconds.\n","5000"},
+    { "BytecodeTimeout", "bytecode-timeout", 0, TYPE_NUMBER, MATCH_NUMBER, 60000, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, 
+	"Set bytecode timeout in miliseconds.\n","60000"},
     { "DetectPUA", "detect-pua", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "Detect Potentially Unwanted Applications.", "yes" },
 
     { "ExcludePUA", "exclude-pua", 0, TYPE_STRING, NULL, -1, NULL, FLAG_MULTIPLE, OPT_CLAMD | OPT_CLAMSCAN, "Exclude a specific PUA category. This directive can be used multiple times.\nSee http://www.clamav.net/support/pua for the complete list of PUA\ncategories.", "NetTool\nPWTool" },

-- 
Debian repository for ClamAV