commit 40ea2044e4ee2dc0fa655809a66e58df942f8b2f
author Karsten Tausche <karsten@fairphone.com> Mon Oct 05 15:47:57 2020 +0200
committer Karsten Tausche <karsten@fairphone.com> Mon Oct 05 15:47:57 2020 +0200
tree d5e49c8953fd0fdaf6ca6a98ff272d0d8acba9ca
parent 06cb80687c77cec67614ca5367cefdc509ecf746
parent 17c9cf4b63cd695a13797c04865e65b0bc64e17d

Merge the android-9.0.0_r60 release tag
Android 9.0.0 release 60

* tag 'android-9.0.0_r60':
  ANDROID: Fix heap overflow in sgdisk

Change-Id: I249c0e08054471eda63b47e3e42c78848d1479ed

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 {