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

[Tomasz Kojm]

The following commit has been merged in the debian/unstable branch:
commit 2e4fd44f4f2382b12f4ef217fdf51ac3dff66dda
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Wed Jan 27 18:33:37 2010 +0100

    libclamav: provide offset in cli_ac_result (bb#1799)

diff --git a/ChangeLog b/ChangeLog
index 08a8a07..7bb50a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 27 18:33:09 CET 2010 (tk)
+---------------------------------
+ * libclamav: provide offset in cli_ac_result (bb#1799)
+
 Tue Jan 26 19:39:18 CET 2010 (acab)
 -----------------------------------
  * win32: automatically check and regenerate vcprojs,
diff --git a/libclamav/matcher-ac.c b/libclamav/matcher-ac.c
index c290fe5..45b3b78 100644
--- a/libclamav/matcher-ac.c
+++ b/libclamav/matcher-ac.c
@@ -1188,6 +1188,7 @@ int cli_ac_scanbuff(const unsigned char *buffer, uint32_t length, const char **v
 					newres->virname = pt->virname;
 					newres->customdata = pt->customdata;
 					newres->next = *res;
+					newres->offset = realoff;
 					*res = newres;
 
 					pt = pt->next_same;
@@ -1229,6 +1230,7 @@ int cli_ac_scanbuff(const unsigned char *buffer, uint32_t length, const char **v
 					return CL_EMEM;
 				    newres->virname = pt->virname;
 				    newres->customdata = pt->customdata;
+				    newres->offset = realoff;
 				    newres->next = *res;
 				    *res = newres;
 
diff --git a/libclamav/matcher-ac.h b/libclamav/matcher-ac.h
index 5d7bd2d..b6fb896 100644
--- a/libclamav/matcher-ac.h
+++ b/libclamav/matcher-ac.h
@@ -79,6 +79,7 @@ struct cli_ac_node {
 struct cli_ac_result {
     const char *virname;
     void *customdata;
+    off_t offset;
     struct cli_ac_result *next;
 };
 

-- 
Debian repository for ClamAV