[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 f60a0e005e92529ed9f2bb1ac6fcf1bcb0366059
Author: Török Edvin <edwin at clamav.net>
Date:   Mon Jun 29 17:56:47 2009 +0300

    Better error messages for bytecode loader.

diff --git a/libclamav/bytecode.c b/libclamav/bytecode.c
index 5e90716..ff4cca7 100644
--- a/libclamav/bytecode.c
+++ b/libclamav/bytecode.c
@@ -464,26 +464,33 @@ int cli_bytecode_load(struct cli_bc *bc, FILE *f, struct cli_dbio *dbio)
     while (cli_dbgets(buffer, FILEBUFF, f, dbio)) {
 	int rc;
 	cli_chomp(buffer);
+	row++;
 	switch (state) {
 	    case PARSE_BC_HEADER:
 		rc = parseHeader(bc, (unsigned char*)buffer);
 		if (rc == CL_BREAK) /* skip */
 		    return CL_SUCCESS;
-		if (rc != CL_SUCCESS)
+		if (rc != CL_SUCCESS) {
+		    cli_errmsg("Error at bytecode line %u\n", row);
 		    return rc;
+		}
 		state = PARSE_FUNC_HEADER;
 		break;
 	    case PARSE_FUNC_HEADER:
 		rc = parseFunctionHeader(bc, current_func, (unsigned char*)buffer);
-		if (rc != CL_SUCCESS)
+		if (rc != CL_SUCCESS) {
+		    cli_errmsg("Error at bytecode line %u\n", row);
 		    return rc;
+		}
 		bb = 0;
 		state = PARSE_BB;
 		break;
 	    case PARSE_BB:
 		rc = parseBB(bc, current_func, bb++, (unsigned char*)buffer);
-		if (rc != CL_SUCCESS)
+		if (rc != CL_SUCCESS) {
+		    cli_errmsg("Error at bytecode line %u\n", row);
 		    return rc;
+		}
 		if (bb >= bc->funcs[current_func].numBB) {
 		    state = PARSE_FUNC_HEADER;
 		    current_func++;
diff --git a/libclamav/clambc.h b/libclamav/clambc.h
index 6b5dcfe..4c40a81 100644
--- a/libclamav/clambc.h
+++ b/libclamav/clambc.h
@@ -25,7 +25,7 @@
 struct bytecode_metadata {
   unsigned long maxStack, maxMem;
   unsigned long maxTime;
-  const char *targetExclude;
+  char *targetExclude;
 };
 
 #define BC_FUNC_LEVEL 1

-- 
Debian repository for ClamAV