[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 ea7b98f80d258185e60b5d7f7867c9186d5b299e
Author: Török Edvin <edwin at clamav.net>
Date:   Fri Sep 25 16:57:43 2009 +0300

    WiP

diff --git a/libclamav/7z.h b/libclamav/bcfeatures.h
similarity index 71%
copy from libclamav/7z.h
copy to libclamav/bcfeatures.h
index cdc11fd..039707f 100644
--- a/libclamav/7z.h
+++ b/libclamav/bcfeatures.h
@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 2009 Sourcefire, Inc.
  *
- *  Authors: aCaB
+ *  Authors: Török Edvin
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -17,16 +17,18 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA 02110-1301, USA.
  */
+#ifndef BC_FEATURES_H
+#define BC_FEATURES_H
 
-#ifndef __7Z_H
-#define __7Z_H
-
-#if HAVE_CONFIG_H
-#include "clamav-config.h"
+/* Compatibility for non-clang compilers */
+#ifndef __has_feature
+#define __has_feature(x) 0
 #endif
 
-#include "others.h"
-
-int cli_7unz (int, cli_ctx *);
+#ifdef __has_feature(attribute_bounds)
+#define EBOUNDS(fieldname) __attribute__((bounds(fieldname)))
+#else
+#define EBOUNDS(x)
+#endif
 
 #endif
diff --git a/libclamav/execs.h b/libclamav/execs.h
index ccd8f52..13a5fec 100644
--- a/libclamav/execs.h
+++ b/libclamav/execs.h
@@ -22,6 +22,7 @@
 #define __EXECS_H
 
 #include "cltypes.h"
+#include "bcfeatures.h"
 #include <sys/types.h>
 
 struct cli_exe_section {
@@ -37,7 +38,7 @@ struct cli_exe_section {
 };
 
 struct cli_exe_info {
-    struct cli_exe_section *section;
+    struct cli_exe_section *section EBOUNDS(nsections);
     off_t offset;
     uint32_t ep;
     uint16_t nsections;

-- 
Debian repository for ClamAV