mbr: Added checks for extended partitions

geky · geky · commit 5b09daf0f969 · 2018-02-13T14:03:02.000-06:00
diff --git a/features/filesystem/bd/MBRBlockDevice.cpp b/features/filesystem/bd/MBRBlockDevice.cpp
@@ -211,7 +211,11 @@ int MBRBlockDevice::init()
     }
 
     // Check for valid entry
-    if (table->entries[_part-1].type == 0x00) {
+    // 0x00 = no entry
+    // 0x05, 0x0f = extended partitions, currently not supported
+    if ((table->entries[_part-1].type == 0x00 ||
+         table->entries[_part-1].type == 0x05 ||
+         table->entries[_part-1].type == 0x0f)) {
         delete[] buffer;
         return BD_ERROR_INVALID_PARTITION;
     }

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,11 @@ int MBRBlockDevice::init()`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`// Check for valid entry`
`214`		`- if (table->entries[_part-1].type == 0x00) {`
	`214`	`+ // 0x00 = no entry`
	`215`	`+ // 0x05, 0x0f = extended partitions, currently not supported`
	`216`	`+ if ((table->entries[_part-1].type == 0x00 \|\|`
	`217`	`+ table->entries[_part-1].type == 0x05 \|\|`
	`218`	`+ table->entries[_part-1].type == 0x0f)) {`
`215`	`219`	`delete[] buffer;`
`216`	`220`	`return BD_ERROR_INVALID_PARTITION;`
`217`	`221`	`}`