[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 18204a6726d1e44d32078632a40bdf900bdd4c3e
Author: Török Edvin <edwin at clamav.net>
Date:   Sat Mar 6 15:58:35 2010 +0200

    READN -> READNfrom

diff --git a/libclamav/bytecode_vm.c b/libclamav/bytecode_vm.c
index 056bf1d..85d95e9 100644
--- a/libclamav/bytecode_vm.c
+++ b/libclamav/bytecode_vm.c
@@ -257,11 +257,13 @@ static always_inline struct stack_entry *pop_stack(struct stack *stack,
     *(void**)&values[p] = x
 
 #define uint_type(n) uint##n##_t
-#define READN(x, n, p)\
-    CHECK_GT(func->numBytes, p+(n/8)-1);\
-    x = *(uint_type(n)*)&values[p];\
+#define READNfrom(maxBytes, from, x, n, p)\
+    CHECK_GT((maxBytes), (p)+(n/8)-1);\
+    x = *(uint_type(n)*)&(from)[(p)];\
     TRACE_R(x)
 
+#define READN(x, n, p) READNfrom(func->numBytes, values, x, n, p)
+
 #define READ1(x, p) READN(x, 8, p);\
     x = x&1
 #define READ8(x, p) READN(x, 8, p)

-- 
Debian repository for ClamAV