@@ -316,16 +316,16 @@ cli_file_t cli_filetype2(fmap_t *map, const struct cl_engine *engine, cli_file_t

             /* raw dmgs must be a multiple of 512 */

             if ((map->len % 512) == 0 && map->len > 512) {

-                /* check if detected MBR is protective on GPT */

-                if (gpt_detect_size(map) != 0) {

-                    cli_dbgmsg("Recognized GUID Partition Table file\n");

-                    return CL_TYPE_GPT;

-                }

-

                 /* check if the MBR is a valid configuration */

                 if (cli_mbr_check(buff, bread, map->len) == 0) {

                     return CL_TYPE_MBR;

                 }

+

+                /* check if detected MBR is protective or hybridon GPT */

+                if (cli_mbr_check_gpt(buff, bread) != 0) {

+                    cli_dbgmsg("Recognized GUID Partition Table file\n");

+                    return CL_TYPE_GPT;

+                }

             }

             /* re-detect type */

@@ -80,18 +80,22 @@ size_t gpt_detect_size(fmap_t *map)

     unsigned char *buff;

     buff = (unsigned char*)fmap_need_off_once(map, 512, 8);

+    if (!buff) return 0;

     if (0 == strncmp(buff, GPT_SIGNATURE_STR, 8))

         return 512;

     buff = (unsigned char*)fmap_need_off_once(map, 1024, 8);

+    if (!buff) return 0;

     if (0 == strncmp(buff, GPT_SIGNATURE_STR, 8))

         return 1024;

     buff = (unsigned char*)fmap_need_off_once(map, 2048, 8);

+    if (!buff) return 0;

     if (0 == strncmp(buff, GPT_SIGNATURE_STR, 8))

         return 2048;

     buff = (unsigned char*)fmap_need_off_once(map, 4096, 8);

+    if (!buff) return 0;

     if (0 == strncmp(buff, GPT_SIGNATURE_STR, 8))

         return 4096;

@@ -94,6 +94,23 @@ int cli_mbr_check(const unsigned char *buff, size_t len, size_t maplen) {

     return mbr_check_mbr(&mbr, maplen, sectorsize);

 }

+int cli_mbr_check_gpt(const unsigned char *buff, size_t len) {

+    struct mbr_boot_record mbr;

+    off_t mbr_base = 0;

+    size_t sectorsize = 512;

+

+    if (len < sectorsize) {

+        return CL_EFORMAT;

+    }

+

+    mbr_base = sectorsize - sizeof(struct mbr_boot_record);

+    memcpy(&mbr, buff+mbr_base, sizeof(mbr));

+    mbr_convert_to_host(&mbr);

+

+    return ((mbr.entries[0].type == MBR_PROTECTIVE) || 

+            (mbr.entries[0].type == MBR_HYBRID));

+}

+

 /* sets sectorsize to default value if specfied to be 0 */

 int cli_scanmbr(cli_ctx *ctx, size_t sectorsize)

 {

@@ -85,6 +85,7 @@ struct mbr_boot_record {

 #endif

 int cli_mbr_check(const unsigned char *buff, size_t len, size_t maplen);

+int cli_mbr_check_gpt(const unsigned char *buff, size_t len);

 int cli_scanmbr(cli_ctx *ctx, size_t sectorsize);

 void mbr_convert_to_host(struct mbr_boot_record *record);