ANDROID: Fix heap overflow in sgdisk am: 7e46be3a55

Original change: undetermined

Change-Id: I71cd4208bd4d233053255e0c893a1c31bcbc2153

1 files changed, 4 insertions, 1 deletions

diff --git a/gpt.cc b/gpt.cc
index 9ad769a..303bdf7 100644
--- a/gpt.cc
+++ b/gpt.cc
@@ -952,7 +952,10 @@ int GPTData::LoadPartitionTable(const struct GPTHeader & header, DiskIO & disk,
    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 {