commit d0c42f389a4a919878bfab7ceca2e845e42c2c08
author Xin Li <delphij@google.com> Tue Sep 08 16:54:27 2020 -0700
committer Xin Li <delphij@google.com> Tue Sep 08 16:54:27 2020 -0700
tree 60e5936946acde1a831c8fb5f027a7d8a85a4312
parent f00572f20bf48fb47d90a3d71c1dbd5a7c97f8b0
parent 270fd81dc349d1fc75850604d0911780d269e572

Merge Android R

Bug: 168057903
Merged-In: I54d04ed92be7cdaa42c5be776f666d772e1a5214
Change-Id: I85acfc7d20057e896793e180f3a3b9fc779e50a6

gpt.cc

diff --git a/gpt.cc b/gpt.cc
index 1546313..2d2e72c 100644
--- a/gpt.cc
+++ b/gpt.cc
@@ -1060,7 +1060,10 @@
    uint32_t sizeOfParts, newCRC;
    int retval;
 
-   if (disk.OpenForRead()) {
+   if (header.sizeOfPartitionEntries != sizeof(GPTPart)) {
+      cerr << "Error! GPT header contains invalid partition entry size!\n";
+      retval = 0;
+   } else if (disk.OpenForRead()) {
       if (sector == 0) {
          retval = disk.Seek(header.partitionEntriesLBA);
       } else {