commit 94b38c3728989049a1e6526d5e7db530b890e01f
author android-build-team Robot <android-build-team-robot@google.com> Tue Jul 28 20:36:18 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jul 28 20:36:18 2020 +0000
tree d5e49c8953fd0fdaf6ca6a98ff272d0d8acba9ca
parent 9c50b5e176b95034b54d04856388ac3be6132076
parent b1e082466349129acc3712d25892e383f1706171

Snap for 6715459 from b1e082466349129acc3712d25892e383f1706171 to pi-wear-hmr2-dr-beluga-release

Change-Id: Ic4ee8a6953c99d6fcd4c8682a16b4fa1a73b739c

gpt.cc

diff --git a/gpt.cc b/gpt.cc
index 9ad769a..303bdf7 100644
--- a/gpt.cc
+++ b/gpt.cc
@@ -952,7 +952,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 {