@@ -879,47 +879,46 @@ handler_enum(ole2_header_t * hdr, property_t * prop, const char *dir, cli_ctx *

     json_object *arrobj, *strmobj;

     name = get_property_name2(prop->name, prop->name_size);

-    if (ctx->options & CL_SCAN_FILE_PROPERTIES && ctx->wrkproperty != NULL) {

-        arrobj = json_object_object_get(ctx->wrkproperty, "Streams");

-        if (NULL == arrobj) {

-            arrobj = json_object_new_array();

+    if (name) {

+        if (ctx->options & CL_SCAN_FILE_PROPERTIES && ctx->wrkproperty != NULL) {

+            arrobj = json_object_object_get(ctx->wrkproperty, "Streams");

             if (NULL == arrobj) {

-                cli_errmsg("ole2: no memory for streams list as json array\n");

-                return CL_EMEM;

+                arrobj = json_object_new_array();

+                if (NULL == arrobj) {

+                    cli_errmsg("ole2: no memory for streams list as json array\n");

+                    return CL_EMEM;

+                }

+                json_object_object_add(ctx->wrkproperty, "Streams", arrobj);

             }

-            json_object_object_add(ctx->wrkproperty, "Streams", arrobj);

-        }

-        strmobj = json_object_new_string(name);

-        json_object_array_add(arrobj, strmobj);

+            strmobj = json_object_new_string(name);

+            json_object_array_add(arrobj, strmobj);

-        if (!strcmp(name, "powerpoint document")) {

-            cli_jsonstr(ctx->wrkproperty, "FileType", "CL_TYPE_MSPPT");

-        }

-        if (!strcmp(name, "worddocument")) {

-            cli_jsonstr(ctx->wrkproperty, "FileType", "CL_TYPE_MSDOC");

-        }

-        if (!strcmp(name, "workbook")) {

-            cli_jsonstr(ctx->wrkproperty, "FileType", "CL_TYPE_MSXLS");

+            if (!strcmp(name, "powerpoint document")) {

+                cli_jsonstr(ctx->wrkproperty, "FileType", "CL_TYPE_MSPPT");

+            }

+            if (!strcmp(name, "worddocument")) {

+                cli_jsonstr(ctx->wrkproperty, "FileType", "CL_TYPE_MSDOC");

+            }

+            if (!strcmp(name, "workbook")) {

+                cli_jsonstr(ctx->wrkproperty, "FileType", "CL_TYPE_MSXLS");

+            }

         }

-    }

-#endif

-    if (!hdr->has_vba) {

-#if HAVE_JSON

-#else

-        name = get_property_name2(prop->name, prop->name_size);

-#endif

-        if (name) {

+        if (!hdr->has_vba) {

             if (!strcmp(name, "_vba_project") || !strcmp(name, "powerpoint document") || !strcmp(name, "worddocument") || !strcmp(name, "_1_ole10native"))

                 hdr->has_vba = 1;

-#if HAVE_JSON

-#else

-            free(name);

-#endif

         }

+        free(name);

     }

-#if HAVE_JSON

-    free(name);

+#else

+        if (!hdr->has_vba) {

+            name = get_property_name2(prop->name, prop->name_size);

+            if (name) {

+                if (!strcmp(name, "_vba_project") || !strcmp(name, "powerpoint document") || !strcmp(name, "worddocument") || !strcmp(name, "_1_ole10native"))

+                    hdr->has_vba = 1;

+                free(name);

+            }

+        }

 #endif

     return CL_SUCCESS;

@@ -44,6 +44,8 @@

 #include <libxml/xmlreader.h>

 #endif

+#if HAVE_LIBXML2 && HAVE_JSON

+

 #define OOXML_JSON_RECLEVEL 16

 #define OOXML_JSON_RECLEVEL_MAX 5

 #define OOXML_JSON_STRLEN_MAX 100

@@ -184,8 +186,7 @@ static const char *ooxml_check_key(const char* key, size_t keylen)

     return NULL;

 }

-#if HAVE_LIBXML2

-#if HAVE_JSON

+

 static int ooxml_parse_element(xmlTextReaderPtr reader, json_object *wrkptr, int rlvl, int skip)

 {

     const char *element_tag = NULL, *end_tag = NULL;

@@ -347,14 +348,10 @@ static int ooxml_parse_document(int fd, cli_ctx *ctx)

     xmlFreeTextReader(reader);

     return ret;

 }

-#endif

-#endif

 static int ooxml_basic_json(int fd, cli_ctx *ctx, const char *key)

 {

     int ret = CL_SUCCESS;

-#if HAVE_LIBXML2

-#if HAVE_JSON

     const xmlChar *stack[OOXML_JSON_RECLEVEL];

     json_object *summary, *wrkptr;

     int type, rlvl = 0;

@@ -455,12 +452,6 @@ static int ooxml_basic_json(int fd, cli_ctx *ctx, const char *key)

  ooxml_basic_exit:

     xmlTextReaderClose(reader);

     xmlFreeTextReader(reader);

-#else

-    cli_dbgmsg("ooxml_basic_json: libjson needs to enabled!\n");

-#endif

-#else

-    cli_dbgmsg("ooxml_basic_json: libxml2 needs to enabled!\n");

-#endif

     return ret;

 }

@@ -480,7 +471,6 @@ static int ooxml_extn_cb(int fd, cli_ctx *ctx)

 static int ooxml_content_cb(int fd, cli_ctx *ctx)

 {

-#if HAVE_LIBXML2

     int ret = CL_SUCCESS;

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

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

@@ -575,15 +565,12 @@ static int ooxml_content_cb(int fd, cli_ctx *ctx)

     xmlTextReaderClose(reader);

     xmlFreeTextReader(reader);

     return ret;

-#else

-    cli_dbgmsg("ooxml_content_cb: libxml2 needs to enabled!");

-    return CL_SUCCESS;

-#endif

 }

+#endif

 int cli_process_ooxml(cli_ctx *ctx)

 {

-#if HAVE_LIBXML2

+#if HAVE_LIBXML2 && HAVE_JSON

     uint32_t loff = 0;

     cli_dbgmsg("in cli_processooxml\n");

@@ -601,7 +588,12 @@ int cli_process_ooxml(cli_ctx *ctx)

     return unzip_single_internal(ctx, loff, ooxml_content_cb);

 #else

     cli_dbgmsg("in cli_processooxml\n");

+#if !HAVE_LIBXML2

     cli_dbgmsg("cli_process_ooxml: libxml2 needs to enabled!");

+#endif

+#if !HAVE_JSON

+    cli_dbgmsg("cli_process_ooxml: libjson needs to enabled!");

+#endif

     return CL_SUCCESS;

 #endif

 }

@@ -1199,8 +1199,10 @@ static int cli_vba_scandir(const char *dirname, cli_ctx *ctx, struct uniq *U)

     }

     closedir(dd);

+#if HAVE_JSON

     if (hasmacros && ctx->options & CL_SCAN_FILE_PROPERTIES && ctx->wrkproperty != NULL)

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

+#endif

     if(BLOCK_MACROS && hasmacros) {

 	cli_append_virus(ctx, "Heuristics.OLE2.ContainsMacros");

 	ret = CL_VIRUS;