[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 84edf09bba78147504ca73be99164e1344543cc9
Author: Török Edvin <edwin at clamav.net>
Date:   Mon Mar 22 14:58:51 2010 +0200

    Fix clambc -p.

diff --git a/libclamav/c++/bytecode2llvm.cpp b/libclamav/c++/bytecode2llvm.cpp
index 588c124..7334cac 100644
--- a/libclamav/c++/bytecode2llvm.cpp
+++ b/libclamav/c++/bytecode2llvm.cpp
@@ -1579,6 +1579,7 @@ int cli_bytecode_init_jit(struct cli_all_bc *bcs, unsigned dconfmask)
     if (!bcs->engine)
 	return CL_EMEM;
     bcs->engine->EE = 0;
+    bcs->engine->Listener = 0;
     return 0;
 }
 
@@ -1587,7 +1588,8 @@ int cli_bytecode_done_jit(struct cli_all_bc *bcs)
     LLVMApiScopedLock scopedLock;
     if (bcs->engine) {
 	if (bcs->engine->EE) {
-	    bcs->engine->EE->UnregisterJITEventListener(bcs->engine->Listener);
+	    if (bcs->engine->Listener)
+		bcs->engine->EE->UnregisterJITEventListener(bcs->engine->Listener);
 	    delete bcs->engine->EE;
 	}
 	delete bcs->engine->Listener;
diff --git a/shared/optparser.c b/shared/optparser.c
index 7a8670d..835e4bc 100644
--- a/shared/optparser.c
+++ b/shared/optparser.c
@@ -121,6 +121,7 @@ const struct clam_option __clam_options[] = {
     { NULL, "generate-config", 'g', TYPE_STRING, NULL, -1, NULL, 0, OPT_CLAMCONF, "", "" },
 
     { NULL, "force-interpreter", 'f', TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMBC, "Force using the interpreter instead of the JIT", "" },
+    { NULL, "trust-bytecode", 't', TYPE_BOOL, MATCH_BOOL, 1, NULL, 0, OPT_CLAMBC, "Trust loaded bytecode (default yes)", ""},
     { NULL, "bytecode-trust-all", 't', TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMSCAN, "Trust loaded bytecode (default: only if signed)", ""},
     { NULL, "info", 'i', TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMBC, "Load and print bytecode information without executing", ""},
     { NULL, "printsrc", 'p', TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMBC, "Print source code of bytecode", ""},

-- 
Debian repository for ClamAV