@@ -60,11 +60,22 @@

 #include "others.h"

 #include "libclamav/conv.h"

 #include "libclamav/str.h"

+#include "iowrap.h"

 #if defined(_WIN32)

 char * strptime(const char *buf, const char *fmt, struct tm *tm);

 #endif

+#if defined(_WIN32)

+#define EXCEPTION_PREAMBLE __try {

+#define EXCEPTION_POSTAMBLE } __except (filter_memcpy(GetExceptionCode(), GetExceptionInformation())) { \

+    winres=1; \

+}

+#else

+#define EXCEPTION_PREAMBLE

+#define EXCEPTION_POSTAMBLE

+#endif

+

 #if !defined(MIN)

     #define MIN(x,y) ((x)<(y)?(x):(y))

 #endif

@@ -132,6 +143,7 @@ unsigned char *cl_hash_data(char *alg, const void *buf, size_t len, unsigned cha

     const EVP_MD *md;

     unsigned int i;

     size_t cur;

+    int winres=0;

     md = EVP_get_digestbyname(alg);

     if (!(md))

@@ -170,6 +182,8 @@ unsigned char *cl_hash_data(char *alg, const void *buf, size_t len, unsigned cha

     cur=0;

     while (cur < len) {

         size_t todo = MIN((unsigned long)EVP_MD_block_size(md), (unsigned long)(len-cur));

+

+        EXCEPTION_PREAMBLE

         if (!EVP_DigestUpdate(ctx, (void *)(((unsigned char *)buf)+cur), todo)) {

             if (!(obuf))

                 free(ret);

@@ -180,6 +194,18 @@ unsigned char *cl_hash_data(char *alg, const void *buf, size_t len, unsigned cha

             EVP_MD_CTX_destroy(ctx);

             return NULL;

         }

+        EXCEPTION_POSTAMBLE

+

+        if (winres) {

+            if (!(obuf))

+                free(ret);

+

+            if ((olen))

+                *olen = 0;

+

+            EVP_MD_CTX_destroy(ctx);

+            return NULL;

+        }

         cur += todo;

     }

@@ -240,6 +266,7 @@ unsigned char *cl_hash_file_fd_ctx(EVP_MD_CTX *ctx, int fd, unsigned int *olen)

     int mdsz;

     unsigned int hashlen;

     STATBUF sb;

+    int winres=0;

 	unsigned int blocksize;

@@ -277,12 +304,21 @@ unsigned char *cl_hash_file_fd_ctx(EVP_MD_CTX *ctx, int fd, unsigned int *olen)

 #else

     while ((nread = read(fd, buf, blocksize)) > 0) {

 #endif

+        EXCEPTION_PREAMBLE

         if (!EVP_DigestUpdate(ctx, buf, nread)) {

             free(buf);

             free(hash);

             return NULL;

         }

+        EXCEPTION_POSTAMBLE

+

+        if (winres) {

+            free(buf);

+            free(hash);

+

+            return NULL;

+        }

     }

     if (!EVP_DigestFinal_ex(ctx, hash, &hashlen)) {

@@ -1123,11 +1159,18 @@ void *cl_hash_init(const char *alg)

 int cl_update_hash(void *ctx, void *data, size_t sz)

 {

+    int winres=0;

+

     if (!(ctx) || !(data))

         return -1;

+    EXCEPTION_PREAMBLE

     if (!EVP_DigestUpdate((EVP_MD_CTX *)ctx, data, sz))

         return -1;

+    EXCEPTION_POSTAMBLE

+

+    if (winres)

+        return -1;

     return 0;

 }

@@ -33,7 +33,7 @@

 #endif

 #ifdef _WIN32

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

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

     }

@@ -42,4 +42,8 @@

  */

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

+#ifdef _WIN32

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

+#endif

+

 #endif