@@ -120,6 +120,7 @@ static const struct ftmap_s {

     { "CL_TYPE_OOXML_WORD",	CL_TYPE_OOXML_WORD     	},

     { "CL_TYPE_OOXML_PPT",	CL_TYPE_OOXML_PPT     	},

     { "CL_TYPE_OOXML_XL",	CL_TYPE_OOXML_XL     	},

+    { "CL_TYPE_INTERNAL",	CL_TYPE_INTERNAL     	},

     { NULL,			CL_TYPE_IGNORED		}

 };

@@ -83,6 +83,7 @@ typedef enum {

     CL_TYPE_OOXML_WORD,

     CL_TYPE_OOXML_PPT,

     CL_TYPE_OOXML_XL,

+    CL_TYPE_INTERNAL,

     /* Section for partition types */

     CL_TYPE_PART_ANY, /* unknown partition type */

@@ -180,6 +180,7 @@ static const char *ftypes_int[] = {

   "1:510:55AA:Disk Image - Master Boot Record:CL_TYPE_ANY:CL_TYPE_MBR:77",

   "0:512:4546492050415254:Disk Image - GUID Partition Table:CL_TYPE_ANY:CL_TYPE_GPT:77",

   "1:0:4552{510}504D0000:Disk Image - Apple Partition Map:CL_TYPE_ANY:CL_TYPE_APM:77",

+  "0:2:224d61676963223a20224a534f4e22:Internal properties:CL_TYPE_ANY:CL_TYPE_INTERNAL:77",

   NULL

 };

@@ -140,7 +140,7 @@ struct cli_mtarget {

     uint8_t target_count; /* must be synced with non-zero values in the target array */

 };

-#define CLI_MTARGETS 13

+#define CLI_MTARGETS 14

 static const struct cli_mtarget cli_mtargets[CLI_MTARGETS] =  {

     { {0, 0},                                   "GENERIC",      0,  0, 1, 1 },

     { {CL_TYPE_MSEXE, 0},                       "PE",           1,  0, 1, 1 },

@@ -154,7 +154,8 @@ static const struct cli_mtarget cli_mtargets[CLI_MTARGETS] =  {

     { {CL_TYPE_MACHO, CL_TYPE_MACHO_UNIBIN},    "MACH-O",       9,  1, 0, 2 },

     { {CL_TYPE_PDF, 0},                         "PDF",         10,  1, 0, 1 },

     { {CL_TYPE_SWF, 0},                         "FLASH",       11,  1, 0, 1 },

-    { {CL_TYPE_JAVA, 0},                        "JAVA",        12,  1, 0, 1 }

+    { {CL_TYPE_JAVA, 0},                        "JAVA",        12,  1, 0, 1 },

+    { {CL_TYPE_INTERNAL, 0},                    "INTERNAL",    13,  1, 0, 1 }

 };

 #define CLI_OFF_ANY         0xffffffff

@@ -2609,6 +2609,9 @@ static int magic_scandesc(cli_ctx *ctx, cli_file_t type)

                     early_ret_from_magicscan(CL_EMEM);       

                 }

                 ctx->wrkproperty = ctx->properties;

+                if (ret = cli_jsonstr(ctx->properties, "Magic", "JSON") != CL_SUCCESS) {

+                    early_ret_from_magicscan(ret);

+                }

 	    } else { /* turn off property collection flag for file types we don't care about */

                 ctx->options &= ~CL_SCAN_FILE_PROPERTIES;	

             }

@@ -3396,6 +3399,8 @@ static int scan_common(int desc, cl_fmap_t *map, const char **virname, unsigned

         }

         else {

             cli_errmsg("%s\n", jstring);

+            ctx.options &= ~CL_SCAN_FILE_PROPERTIES;

+            rc = cli_mem_scandesc(jstring, strlen(jstring), &ctx);

         }

         json_object_put(ctx.properties); // frees

     }