@@ -72,6 +72,8 @@ endif

 libclamav_internal_utils_la_SOURCES=str.c\

 				    str.h\

+				    iowrap.c \

+				    iowrap.h \

 				    md5.c\

 				    md5.h\

 				    others_common.c \

@@ -93,6 +95,8 @@ libclamav_internal_utils_la_CFLAGS=$(AM_CFLAGS)  -fPIC -DPIC

 libclamav_internal_utils_nothreads_la_SOURCES=str.c\

 				    str.h\

+				    iowrap.c \

+				    iowrap.h \

 				    md5.c\

 				    md5.h\

 				    others_common.c \

@@ -231,6 +231,7 @@ libclamav_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \

 libclamav_internal_utils_la_LIBADD =

 am_libclamav_internal_utils_la_OBJECTS =  \

 	libclamav_internal_utils_la-str.lo \

+	libclamav_internal_utils_la-iowrap.lo \

 	libclamav_internal_utils_la-md5.lo \

 	libclamav_internal_utils_la-others_common.lo \

 	libclamav_internal_utils_la-qsort.lo \

@@ -248,6 +249,7 @@ libclamav_internal_utils_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \

 libclamav_internal_utils_nothreads_la_LIBADD =

 am_libclamav_internal_utils_nothreads_la_OBJECTS =  \

 	libclamav_internal_utils_nothreads_la-str.lo \

+	libclamav_internal_utils_nothreads_la-iowrap.lo \

 	libclamav_internal_utils_nothreads_la-md5.lo \

 	libclamav_internal_utils_nothreads_la-others_common.lo \

 	libclamav_internal_utils_nothreads_la-qsort.lo \

@@ -585,6 +587,8 @@ EXTRA_DIST = c++/Makefile.nollvm.in $(am__append_4) regex/engine.c \

 @ENABLE_UNRAR_TRUE@IFACEDEP = libclamunrar_iface.la

 libclamav_internal_utils_la_SOURCES = str.c\

 				    str.h\

+				    iowrap.c\

+				    iowrap.h\

 				    md5.c\

 				    md5.h\

 				    others_common.c \

@@ -605,6 +609,8 @@ libclamav_internal_utils_la_LDFLAGS = -static

 libclamav_internal_utils_la_CFLAGS = $(AM_CFLAGS)  -fPIC -DPIC

 libclamav_internal_utils_nothreads_la_SOURCES = str.c\

 				    str.h\

+				    iowrap.c\

+				    iowrap.h\

 				    md5.c\

 				    md5.h\

 				    others_common.c \

@@ -845,6 +851,7 @@ distclean-compile:

 	-rm -f *.tab.c

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bytecode_nojit.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-iowrap.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-md5.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-others_common.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-qsort.Plo@am__quote@

@@ -854,6 +861,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regfree.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-str.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-strlcpy.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-iowrap.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-md5.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-others_common.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-qsort.Plo@am__quote@

@@ -2437,6 +2445,13 @@ libclamav_internal_utils_la-str.lo: str.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-str.lo `test -f 'str.c' || echo '$(srcdir)/'`str.c

+libclamav_internal_utils_la-iowrap.lo: iowrap.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-iowrap.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-iowrap.Tpo -c -o libclamav_internal_utils_la-iowrap.lo `test -f 'iowrap.c' || echo '$(srcdir)/'`iowrap.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-iowrap.Tpo $(DEPDIR)/libclamav_internal_utils_la-iowrap.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='iowrap.c' object='libclamav_internal_utils_la-iowrap.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-iowrap.lo `test -f 'iowrap.c' || echo '$(srcdir)/'`iowrap.c

+

 libclamav_internal_utils_la-md5.lo: md5.c

 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-md5.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-md5.Tpo -c -o libclamav_internal_utils_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c

 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-md5.Tpo $(DEPDIR)/libclamav_internal_utils_la-md5.Plo

@@ -2500,6 +2515,13 @@ libclamav_internal_utils_nothreads_la-str.lo: str.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-str.lo `test -f 'str.c' || echo '$(srcdir)/'`str.c

+libclamav_internal_utils_nothreads_la-iowrap.lo: iowrap.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-iowrap.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-iowrap.Tpo -c -o libclamav_internal_utils_nothreads_la-iowrap.lo `test -f 'iowrap.c' || echo '$(srcdir)/'`iowrap.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-iowrap.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-iowrap.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='iowrap.c' object='libclamav_internal_utils_nothreads_la-iowrap.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-iowrap.lo `test -f 'iowrap.c' || echo '$(srcdir)/'`iowrap.c

+

 libclamav_internal_utils_nothreads_la-md5.lo: md5.c

 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-md5.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-md5.Tpo -c -o libclamav_internal_utils_nothreads_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c

 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-md5.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-md5.Plo

@@ -688,7 +688,8 @@ void cache_add(unsigned char *md5, size_t size, cli_ctx *ctx) {

 }

 /* Hashes a file onto the provided buffer and looks it up the cache.

-   Returns CL_VIRUS if found, CL_CLEAN if not FIXME or an error */

+   Returns CL_VIRUS if found, CL_CLEAN if not FIXME or a recoverable error,

+   and returns CL_EREAD if unrecoverable */

 int cache_check(unsigned char *hash, cli_ctx *ctx) {

     fmap_t *map;

     size_t todo, at = 0;

@@ -709,7 +710,10 @@ int cache_check(unsigned char *hash, cli_ctx *ctx) {

 	    return CL_EREAD;

 	todo -= readme;

 	at += readme;

-	cli_md5_update(&md5, buf, readme);

+	if (cli_md5_update(&md5, buf, readme)) {

+	    cli_errmsg("cache_check: error reading while generating hash!\n");

+	    return CL_EREAD;

+	}

     }

     cli_md5_final(hash, &md5);

     ret = cache_lookup_hash(hash, map->len, ctx->engine->cache, ctx->recursion);

new file mode 100644

@@ -0,0 +1,60 @@

+/*

+ *  Copyright (C) 2012 Sourcefire, Inc.

+ *

+ *  Authors: Dave Raynor

+ *

+ *  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

+ *  published by the Free Software Foundation.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

+ *  MA 02110-1301, USA.

+ *

+ */

+

+#include "iowrap.h"

+

+#include <string.h>

+

+#ifdef _WIN32

+#include <windows.h>

+#include <excpt.h>

+

+#ifndef STATUS_DEVICE_DATA_ERROR

+#define STATUS_DEVICE_DATA_ERROR 0xC000009C

+#endif

+#endif

+

+#ifdef _WIN32

+static int filter_memcpy(unsigned int code, struct _EXCEPTION_POINTERS *ep) {

+    if ((code == EXCEPTION_IN_PAGE_ERROR) || (code == STATUS_DEVICE_DATA_ERROR)) {

+        return EXCEPTION_EXECUTE_HANDLER;

+    }

+    return EXCEPTION_CONTINUE_SEARCH;

+}

+#endif

+

+int cli_memcpy(void *target, const void *source, unsigned long size)

+{

+    int ret = 0;

+

+#ifdef _WIN32

+    __try {

+#endif

+    memcpy(target, source, size);

+#ifdef _WIN32

+    }

+    __except (filter_memcpy(GetExceptionCode(), GetExceptionInformation())) {

+        ret = 1;

+    }

+#endif

+    return ret;

+}

+

new file mode 100644

@@ -0,0 +1,45 @@

+/*

+ *  Copyright (C) 2012 Sourcefire, Inc.

+ *

+ *  Authors: Dave Raynor

+ *

+ *  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

+ *  published by the Free Software Foundation.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

+ *  MA 02110-1301, USA.

+ */

+

+#ifndef __IOWRAP_H

+#define __IOWRAP_H

+

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

+#ifdef HAVE_UNISTD_H

+#include <unistd.h>

+#endif

+

+#include <stdio.h>

+#include <stdlib.h>

+#ifdef _WIN32

+#include <windows.h>

+#include <excpt.h>

+#endif

+

+/*

+ * cli_memcpy is an io wrapper that will allow ClamAV to minimize impact of

+ * adding SEH logic around map accesses where Windows might raise an error

+ */

+int cli_memcpy(void *target, const void *source, unsigned long size);

+

+#endif

@@ -13,11 +13,14 @@

  * This implementation is meant to be fast, but not as fast as possible.

  * Some known optimizations are not included to reduce source code size

  * and avoid compile-time configuration.

+ *

+ * Updated in 2012 to meet the needs of ClamAV.

  */

 #include <string.h>

 #include "md5.h"

+#include "iowrap.h"

 /*

  * The basic MD5 functions.

@@ -49,16 +52,16 @@

  */

 #if defined(__i386__) || defined(__x86_64__) || defined(__vax__)

 #define SET(n) \

-	(*(const MD5_u32plus *)&ptr[(n) * 4])

+	(*(const MD5_u32plus *)&chunk[(n) * 4])

 #define GET(n) \

 	SET(n)

 #else

 #define SET(n) \

 	(ctx->block[(n)] = \

-	(MD5_u32plus)ptr[(n) * 4] | \

-	((MD5_u32plus)ptr[(n) * 4 + 1] << 8) | \

-	((MD5_u32plus)ptr[(n) * 4 + 2] << 16) | \

-	((MD5_u32plus)ptr[(n) * 4 + 3] << 24))

+	(MD5_u32plus)chunk[(n) * 4] | \

+	((MD5_u32plus)chunk[(n) * 4 + 1] << 8) | \

+	((MD5_u32plus)chunk[(n) * 4 + 2] << 16) | \

+	((MD5_u32plus)chunk[(n) * 4 + 3] << 24))

 #define GET(n) \

 	(ctx->block[(n)])

 #endif

@@ -66,12 +69,14 @@

 /*

  * This processes one or more 64-byte data blocks, but does NOT update

  * the bit counters.  There are no alignment requirements.

+ * Returns NULL on a read error, or a pointer to the next byte if successful.

  */

 static const void *body(cli_md5_ctx *ctx, const void *data, unsigned long size)

 {

 	const unsigned char *ptr;

 	MD5_u32plus a, b, c, d;

 	MD5_u32plus saved_a, saved_b, saved_c, saved_d;

+	unsigned char chunk[64];

 	ptr = data;

@@ -86,6 +91,8 @@ static const void *body(cli_md5_ctx *ctx, const void *data, unsigned long size)

 		saved_c = c;

 		saved_d = d;

+		if(cli_memcpy(chunk, ptr, 64))

+			return NULL;

 /* Round 1 */

 		STEP(F, a, b, c, d, SET(0), 0xd76aa478, 7)

 		STEP(F, d, a, b, c, SET(1), 0xe8c7b756, 12)

@@ -185,10 +192,11 @@ void cli_md5_init(cli_md5_ctx *ctx)

 	ctx->hi = 0;

 }

-void cli_md5_update(cli_md5_ctx *ctx, const void *data, unsigned long size)

+int cli_md5_update(cli_md5_ctx *ctx, const void *data, unsigned long size)

 {

 	MD5_u32plus saved_lo;

 	unsigned long used, free;

+	int invalid = 0;

 	saved_lo = ctx->lo;

 	if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo)

@@ -201,22 +209,27 @@ void cli_md5_update(cli_md5_ctx *ctx, const void *data, unsigned long size)

 		free = 64 - used;

 		if (size < free) {

-			memcpy(&ctx->buffer[used], data, size);

-			return;

+			invalid = cli_memcpy(&ctx->buffer[used], data, size);

+			return invalid;

 		}

-		memcpy(&ctx->buffer[used], data, free);

+		invalid = cli_memcpy(&ctx->buffer[used], data, free);

+		if (invalid)

+			return invalid;

 		data = (const unsigned char *)data + free;

 		size -= free;

-		body(ctx, ctx->buffer, 64);

+		if (body(ctx, ctx->buffer, 64) == NULL)

+			return 1;

 	}

 	if (size >= 64) {

 		data = body(ctx, data, size & ~(unsigned long)0x3f);

+		if (data == NULL)

+			return 1;

 		size &= 0x3f;

 	}

-	memcpy(ctx->buffer, data, size);

+	return cli_memcpy(ctx->buffer, data, size);

 }

 void cli_md5_final(unsigned char *result, cli_md5_ctx *ctx)

@@ -5,6 +5,8 @@

  * Written by Solar Designer <solar at openwall.com> in 2001, and placed

  * in the public domain.  There's absolutely no warranty.

  *

+ * Updated in 2012 to meet the needs of ClamAV.

+ *

  * See md5.c for more information.

  */

@@ -22,7 +24,7 @@ typedef struct {

 } cli_md5_ctx;

 extern void cli_md5_init(cli_md5_ctx *ctx);

-extern void cli_md5_update(cli_md5_ctx *ctx, const void *data, unsigned long size);

+extern int cli_md5_update(cli_md5_ctx *ctx, const void *data, unsigned long size);

 extern void cli_md5_final(unsigned char *result, cli_md5_ctx *ctx);

 #endif

@@ -309,6 +309,7 @@

     <ClCompile Include="..\libclamav\hashtab.c"/>

     <ClCompile Include="..\libclamav\htmlnorm.c"/>

     <ClCompile Include="..\libclamav\inflate64.c"/>

+    <ClCompile Include="..\libclamav\iowrap.c"/>

     <ClCompile Include="..\libclamav\ishield.c"/>

     <ClCompile Include="..\libclamav\is_tar.c"/>

     <ClCompile Include="..\libclamav\jsparse\js-norm.c"/>

@@ -135,6 +135,9 @@

     <ClCompile Include="..\libclamav\inflate64.c">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="..\libclamav\iowrap.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="..\libclamav\is_tar.c">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -496,4 +499,4 @@

       <Filter>Source Files\compat</Filter>

     </ClCompile>

   </ItemGroup>

-</Project>

\ No newline at end of file

+</Project>