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
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 {