@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -955,9 +955,10 @@ distcheck: dist

 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \

 	  && am__cwd=`pwd` \

 	  && $(am__cd) $(distdir)/_build \

-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \

+	  && ../configure \

 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \

 	    $(DISTCHECK_CONFIGURE_FLAGS) \

+	    --srcdir=.. --prefix="$$dc_install_base" \

 	  && $(MAKE) $(AM_MAKEFLAGS) \

 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \

 	  && $(MAKE) $(AM_MAKEFLAGS) check \

@@ -1,4 +1,4 @@

-# generated automatically by aclocal 1.14 -*- Autoconf -*-

+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-

 # Copyright (C) 1996-2013 Free Software Foundation, Inc.

@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],

 [am__api_version='1.14'

 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

 dnl require some minimum version.  Point them to the right macro.

-m4_if([$1], [1.14], [],

+m4_if([$1], [1.14.1], [],

       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

 ])

@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])

 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-[AM_AUTOMAKE_VERSION([1.14])dnl

+[AM_AUTOMAKE_VERSION([1.14.1])dnl

 m4_ifndef([AC_AUTOCONF_VERSION],

   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -536,7 +536,11 @@ version.h: version.h.tmp

 		cp version.h.static version.h;\

 	elif ! diff $@ version.h.tmp >/dev/null 2>/dev/null; then\

 		cp version.h.tmp $@;\

-	fi

+	fi;\

+	if test -f $(top_srcdir)/libclamav/version.h &&\

+           ! diff $(top_srcdir)/libclamav/version.h version.h.tmp >/dev/null 2>/dev/null; then\

+                cp version.h.tmp $(top_srcdir)/libclamav/version.h;\

+        fi

 version.h.tmp:

 	$(AM_V_GEN) test -f version.h || touch version.h;\

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -3420,7 +3420,11 @@ version.h: version.h.tmp

 		cp version.h.static version.h;\

 	elif ! diff $@ version.h.tmp >/dev/null 2>/dev/null; then\

 		cp version.h.tmp $@;\

-	fi

+	fi;\

+	if test -f $(top_srcdir)/libclamav/version.h &&\

+           ! diff $(top_srcdir)/libclamav/version.h version.h.tmp >/dev/null 2>/dev/null; then\

+                cp version.h.tmp $(top_srcdir)/libclamav/version.h;\

+        fi

 version.h.tmp:

 	$(AM_V_GEN) test -f version.h || touch version.h;\

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -5653,9 +5653,10 @@ distcheck: dist

 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \

 	  && am__cwd=`pwd` \

 	  && $(am__cd) $(distdir)/_build \

-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \

+	  && ../configure \

 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \

 	    $(DISTCHECK_CONFIGURE_FLAGS) \

+	    --srcdir=.. --prefix="$$dc_install_base" \

 	  && $(MAKE) $(AM_MAKEFLAGS) \

 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \

 	  && $(MAKE) $(AM_MAKEFLAGS) check \

@@ -5745,8 +5746,8 @@ maintainer-clean-generic:

 	@echo "This command is intended for maintainers to use"

 	@echo "it deletes files that may require special tools to rebuild."

 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)

-@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:

 @BUILD_EXTERNAL_LLVM_TRUE@clean-local:

+@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:

 clean: clean-am

 clean-am: clean-generic clean-libtool clean-local \

@@ -1,4 +1,4 @@

-# generated automatically by aclocal 1.14 -*- Autoconf -*-

+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-

 # Copyright (C) 1996-2013 Free Software Foundation, Inc.

@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],

 [am__api_version='1.14'

 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

 dnl require some minimum version.  Point them to the right macro.

-m4_if([$1], [1.14], [],

+m4_if([$1], [1.14.1], [],

       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

 ])

@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])

 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-[AM_AUTOMAKE_VERSION([1.14])dnl

+[AM_AUTOMAKE_VERSION([1.14.1])dnl

 m4_ifndef([AC_AUTOCONF_VERSION],

   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

@@ -624,9 +624,9 @@ void *mpool_malloc(struct MP *mp, size_t size) {

     mp->avail[sbits] = f->u.next.ptr;

     /* we always have enough space for this, align_increase ensured that */

 #ifdef _WIN64

-	f = (struct FRAG*)(alignto((unsigned long long)f + FRAG_OVERHEAD, align)-FRAG_OVERHEAD);

+    f = (struct FRAG*)(alignto((unsigned long long)f + FRAG_OVERHEAD, align)-FRAG_OVERHEAD);

 #else

-	f = (struct FRAG*)(alignto((unsigned long)f + FRAG_OVERHEAD, align)-FRAG_OVERHEAD);

+    f = (struct FRAG*)(alignto((unsigned long)f + FRAG_OVERHEAD, align)-FRAG_OVERHEAD);

 #endif

     f->u.a.sbits = sbits;

     f->u.a.padding = (char*)f - (char*)fold;

@@ -78,11 +78,29 @@ static int ooxml_is_int(const char *value, size_t len, int32_t *val)

     return 1;

 }

+static int ooxml_add_parse_error(json_object *wrkptr, const xmlChar *errstr)

+{

+    json_object *perr;

+

+    if (!wrkptr)

+        return CL_ENULLARG;

+

+    perr = cli_jsonarray(wrkptr, "ParseErrors");

+    if (perr == NULL) {

+        return CL_EMEM;

+    }

+

+    return cli_jsonstr(perr, NULL, errstr);

+}

+

 static int ooxml_parse_value(json_object *wrkptr, const char *arrname, const xmlChar *node_value)

 {

     json_object *newobj, *arrobj;

     int val;

+    if (!wrkptr)

+        return CL_ENULLARG;

+

     arrobj = cli_jsonarray(wrkptr, arrname);

     if (arrobj == NULL) {

         return CL_EMEM;

@@ -247,7 +265,7 @@ static int ooxml_parse_element(cli_ctx *ctx, xmlTextReaderPtr reader, json_objec

     if (node_type != XML_READER_TYPE_ELEMENT) {

         cli_dbgmsg("ooxml_parse_element: first node typed %d, not %d\n", node_type, XML_READER_TYPE_ELEMENT);

-        return CL_EPARSE; /* first type is not an element */

+        return CL_EFORMAT; /* first type is not an element */

     }

     node_name = xmlTextReaderConstLocalName(reader);

@@ -267,7 +285,7 @@ static int ooxml_parse_element(cli_ctx *ctx, xmlTextReaderPtr reader, json_objec

     /* generate json object */

     thisjobj = cli_jsonobj(wrkptr, element_tag);

     if (!thisjobj) {

-        return CL_EPARSE;

+        return CL_EMEM;

     }

     cli_dbgmsg("ooxml_parse_element: generated json object [%s]\n", element_tag);

@@ -406,10 +424,8 @@ static int ooxml_parse_document(int fd, cli_ctx *ctx)

     ret = ooxml_parse_element(ctx, reader, ctx->wrkproperty, 0, NULL);

-    if (ret != CL_SUCCESS && ret != CL_ETIMEOUT && ret != CL_BREAK) {

+    if (ret != CL_SUCCESS && ret != CL_ETIMEOUT && ret != CL_BREAK)

         cli_warnmsg("ooxml_parse_document: encountered issue in parsing properties document\n");

-        cli_jsonbool(ctx->wrkproperty, "ParseError", 1);

-    }

     xmlTextReaderClose(reader);

     xmlFreeTextReader(reader);

@@ -418,21 +434,35 @@ static int ooxml_parse_document(int fd, cli_ctx *ctx)

 static int ooxml_core_cb(int fd, cli_ctx *ctx)

 {

+    int ret;

+

     cli_dbgmsg("in ooxml_core_cb\n");

-    return ooxml_parse_document(fd, ctx);

-    //return ooxml_basic_json(fd, ctx, "CoreProperties");

+    ret = ooxml_parse_document(fd, ctx);

+    if (ret == CL_EPARSE)

+        ooxml_add_parse_error(ctx->wrkproperty, "OOXML_ERROR_CORE_XMLPARSER");

+    else if (ret == CL_EFORMAT)

+        ooxml_add_parse_error(ctx->wrkproperty, "OOXML_ERROR_CORE_MALFORMED");

+

+    return ret;

 }

 static int ooxml_extn_cb(int fd, cli_ctx *ctx)

 {

+    int ret;

+

     cli_dbgmsg("in ooxml_extn_cb\n");

-    return ooxml_parse_document(fd, ctx);

-    //return ooxml_basic_json(fd, ctx, "ExtendedProperties");

+    ret = ooxml_parse_document(fd, ctx);

+    if (ret == CL_EPARSE)

+        ooxml_add_parse_error(ctx->wrkproperty, "OOXML_ERROR_EXTN_XMLPARSER");

+    else if (ret == CL_EFORMAT)

+        ooxml_add_parse_error(ctx->wrkproperty, "OOXML_ERROR_EXTN_MALFORMED");

+

+    return ret;

 }

 static int ooxml_content_cb(int fd, cli_ctx *ctx)

 {

-    int ret = CL_SUCCESS, tmp, toval = 0;

+    int ret = CL_SUCCESS, tmp, toval = 0, state;

     int core=0, extn=0, cust=0, dsig=0;

     int mcore=0, mextn=0, mcust=0;

     const xmlChar *name, *value, *CT, *PN;

@@ -444,11 +474,12 @@ static int ooxml_content_cb(int fd, cli_ctx *ctx)

     reader = xmlReaderForFd(fd, "[Content_Types].xml", NULL, CLAMAV_MIN_XMLREADER_FLAGS);

     if (reader == NULL) {

         cli_dbgmsg("ooxml_content_cb: xmlReaderForFd error for ""[Content_Types].xml""\n");

+        ooxml_add_parse_error(ctx->wrkproperty, "OOXML_ERROR_XML_READER_FD");

         return CL_SUCCESS; // libxml2 failed!

     }

-    /* locate core-properties, extended-properties, and custom-properties (optional)  */

-    while (xmlTextReaderRead(reader) == 1) {

+    /* locate core-properties, extended-properties, and custom-properties (optional) */

+    while ((state = xmlTextReaderRead(reader)) == 1) {

         if (cli_json_timeout_cycle_check(ctx, &toval) != CL_SUCCESS) {

             ret = CL_ETIMEOUT;

             goto ooxml_content_exit;

@@ -480,88 +511,107 @@ static int ooxml_content_cb(int fd, cli_ctx *ctx)

         if (!CT && !PN) continue;

         if (!xmlStrcmp(CT, (const xmlChar *)"application/vnd.openxmlformats-package.core-properties+xml")) {

-            if (!core) {

-                /* default: /docProps/core.xml*/

-                tmp = unzip_search_single(ctx, (const char *)(PN+1), xmlStrlen(PN)-1, &loff);

-                if (tmp == CL_ETIMEOUT) {

-                    ret = tmp;

-                }

-                else if (tmp != CL_VIRUS) {

-                    cli_dbgmsg("cli_process_ooxml: failed to find core properties file \"%s\"!\n", PN);

-                    mcore++;

-                }

-                else {

-                    cli_dbgmsg("ooxml_content_cb: found core properties file \"%s\" @ %x\n", PN, loff);

-                    ret = unzip_single_internal(ctx, loff, ooxml_core_cb);

-                    core++;

+            /* default: /docProps/core.xml*/

+            tmp = unzip_search_single(ctx, (const char *)(PN+1), xmlStrlen(PN)-1, &loff);

+            if (tmp == CL_ETIMEOUT) {

+                ret = tmp;

+            }

+            else if (tmp != CL_VIRUS) {

+                cli_dbgmsg("cli_process_ooxml: failed to find core properties file \"%s\"!\n", PN);

+                mcore++;

+            }

+            else {

+                cli_dbgmsg("ooxml_content_cb: found core properties file \"%s\" @ %x\n", PN, loff);

+                if (!core) {

+                    tmp = unzip_single_internal(ctx, loff, ooxml_core_cb);

+                    if (tmp == CL_ETIMEOUT || tmp == CL_EMEM) {

+                        ret = tmp;

+                    }

                 }

+                core++;

             }

         }

         else if (!xmlStrcmp(CT, (const xmlChar *)"application/vnd.openxmlformats-officedocument.extended-properties+xml")) {

-            if (!extn) {

-                /* default: /docProps/app.xml */

-                tmp = unzip_search_single(ctx, (const char *)(PN+1), xmlStrlen(PN)-1, &loff);

-                if (tmp == CL_ETIMEOUT) {

-                    ret = tmp;

-                }

-                else if (tmp != CL_VIRUS) {

-                    cli_dbgmsg("cli_process_ooxml: failed to find extended properties file \"%s\"!\n", PN);

-                    mextn++;

-                }

-                else {

-                    cli_dbgmsg("ooxml_content_cb: found extended properties file \"%s\" @ %x\n", PN, loff);

-                    ret = unzip_single_internal(ctx, loff, ooxml_extn_cb);

-                    extn++;

+            /* default: /docProps/app.xml */

+            tmp = unzip_search_single(ctx, (const char *)(PN+1), xmlStrlen(PN)-1, &loff);

+            if (tmp == CL_ETIMEOUT) {

+                ret = tmp;

+            }

+            else if (tmp != CL_VIRUS) {

+                cli_dbgmsg("cli_process_ooxml: failed to find extended properties file \"%s\"!\n", PN);

+                mextn++;

+            }

+            else {

+                cli_dbgmsg("ooxml_content_cb: found extended properties file \"%s\" @ %x\n", PN, loff);

+                if (!extn) {

+                    tmp = unzip_single_internal(ctx, loff, ooxml_extn_cb);

+                    if (tmp == CL_ETIMEOUT || tmp == CL_EMEM) {

+                        ret = tmp;

+                    }

                 }

+                extn++;

             }

         }

         else if (!xmlStrcmp(CT, (const xmlChar *)"application/vnd.openxmlformats-officedocument.custom-properties+xml")) {

-            if (!cust) {

-                /* default: /docProps/custom.xml */

-                tmp = unzip_search_single(ctx, (const char *)(PN+1), xmlStrlen(PN)-1, &loff);

-                if (tmp == CL_ETIMEOUT) {

-                    ret = tmp;

-                }

-                else if (tmp != CL_VIRUS) {

-                    cli_dbgmsg("cli_process_ooxml: failed to find custom properties file \"%s\"!\n", PN);

-                    mcust++;

-                }

-                else {

-                    cli_dbgmsg("ooxml_content_cb: found custom properties file \"%s\" @ %x\n", PN, loff);

-                    cust++;

-                    //ret = unzip_single_internal(ctx, loff, ooxml_cust_cb);

-                }

+            /* default: /docProps/custom.xml */

+            tmp = unzip_search_single(ctx, (const char *)(PN+1), xmlStrlen(PN)-1, &loff);

+            if (tmp == CL_ETIMEOUT) {

+                ret = tmp;

+            }

+            else if (tmp != CL_VIRUS) {

+                cli_dbgmsg("cli_process_ooxml: failed to find custom properties file \"%s\"!\n", PN);

+                mcust++;

+            }

+            else {

+                cli_dbgmsg("ooxml_content_cb: found custom properties file \"%s\" @ %x\n", PN, loff);

+                /* custom properties are not parsed */

+                cust++;

             }

         }

         else if (!xmlStrcmp(CT, (const xmlChar *)"application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml")) {

             dsig++;

         }

-        if (ret != CL_BREAK && ret != CL_SUCCESS)

+        if (ret != CL_SUCCESS)

             goto ooxml_content_exit;

     }

  ooxml_content_exit:

-    if (core)

+    if (core) {

         cli_jsonint(ctx->wrkproperty, "CorePropertiesFileCount", core);

+        if (core > 1)

+            ooxml_add_parse_error(ctx->wrkproperty, "OOXML_ERROR_MULTIPLE_CORE_PROPFILES");

+    }

     else if (!mcore)

         cli_dbgmsg("cli_process_ooxml: file does not contain core properties file\n");

-    if (mcore)

-        cli_jsonint(ctx->wrkproperty, "CorePropertiesMissingFileCount", core);

+    if (mcore) {

+        cli_jsonint(ctx->wrkproperty, "CorePropertiesMissingFileCount", mcore);

+        ooxml_add_parse_error(ctx->wrkproperty, "OOXML_ERROR_MISSING_CORE_PROPFILES");

+    }

-    if (extn)

+    if (extn) {

         cli_jsonint(ctx->wrkproperty, "ExtendedPropertiesFileCount", extn);

+        if (extn > 1)

+            ooxml_add_parse_error(ctx->wrkproperty, "OOXML_ERROR_MULTIPLE_EXTN_PROPFILES");

+    }

     else if (!mextn)

         cli_dbgmsg("cli_process_ooxml: file does not contain extended properties file\n");

-    if (mextn)

-        cli_jsonint(ctx->wrkproperty, "ExtendedPropertiesMissingFileCount", extn);

+    if (mextn) {

+        cli_jsonint(ctx->wrkproperty, "ExtendedPropertiesMissingFileCount", mextn);

+        ooxml_add_parse_error(ctx->wrkproperty, "OOXML_ERROR_MISSING_EXTN_PROPFILES");

+    }

-    if (cust)

+    if (cust) {

         cli_jsonint(ctx->wrkproperty, "CustomPropertiesFileCount", cust);

+        if (cust > 1)

+            ooxml_add_parse_error(ctx->wrkproperty, "OOXML_ERROR_MULTIPLE_CUSTOM_PROPFILES");

+    }

     else if (!mcust)

         cli_dbgmsg("cli_process_ooxml: file does not contain custom properties file\n");

-    if (mcust)

-        cli_jsonint(ctx->wrkproperty, "CustomPropertiesMissingFileCount", cust);

+    if (mcust) {

+        cli_jsonint(ctx->wrkproperty, "CustomPropertiesMissingFileCount", mcust);

+        ooxml_add_parse_error(ctx->wrkproperty, "OOXML_ERROR_MISSING_CUST_PROPFILES");

+    }

     if (dsig) {

         cli_jsonint(ctx->wrkproperty, "DigitalSignaturesCount", dsig);

@@ -620,15 +670,23 @@ int cli_process_ooxml(cli_ctx *ctx)

     /* find "[Content Types].xml" */

     tmp = unzip_search_single(ctx, "[Content_Types].xml", 18, &loff);

     if (tmp == CL_ETIMEOUT) {

+        ooxml_add_parse_error(ctx->wrkproperty, "OOXML_ERROR_TIMEOUT");

         return CL_ETIMEOUT;

     }

     else if (tmp != CL_VIRUS) {

         cli_dbgmsg("cli_process_ooxml: failed to find ""[Content_Types].xml""!\n");

+        ooxml_add_parse_error(ctx->wrkproperty, "OOXML_ERROR_NO_CONTENT_TYPES");

         return CL_EFORMAT;

     }

     cli_dbgmsg("cli_process_ooxml: found ""[Content_Types].xml"" @ %x\n", loff);

-    return unzip_single_internal(ctx, loff, ooxml_content_cb);

+    tmp = unzip_single_internal(ctx, loff, ooxml_content_cb);

+    if (tmp == CL_ETIMEOUT)

+        ooxml_add_parse_error(ctx->wrkproperty, "OOXML_ERROR_TIMEOUT");

+    else if (tmp == CL_EMEM)

+        ooxml_add_parse_error(ctx->wrkproperty, "OOXML_ERROR_OUTOFMEM");

+

+    return tmp;

 #else

     UNUSEDPARAM(ctx);

     cli_dbgmsg("in cli_processooxml\n");

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.