commit 616d6b9c79a979c9ab35c6bb9ff8ecc9e968b12f
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Wed Jan 20 23:04:33 2021 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Wed Jan 20 23:04:33 2021 +0000
tree 869249bbe6844741362dde911c3ed32947641cb8
parent a1043faf016caf0cb44fe2ea52cabd96a012f762
parent ab3ba0f63b929f3244843efcc4d6fae027011c9b

Snap for 7092415 from ab3ba0f63b929f3244843efcc4d6fae027011c9b to r-keystone-qcom-release

Change-Id: I2e0202ee37e709e41f16b7dc642dc5049e9c0bf4

basicmbr.cc

diff --git a/basicmbr.cc b/basicmbr.cc
index 8ac9789..e9ac5c5 100644
--- a/basicmbr.cc
+++ b/basicmbr.cc
@@ -292,7 +292,8 @@
          if (EbrLocations[i] == offset) { // already read this one; infinite logical partition loop!
             cerr << "Logical partition infinite loop detected! This is being corrected.\n";
             allOK = -1;
-            partNum -= 1;
+            if(partNum > 0) //don't go negative
+                partNum -= 1;
          } // if
       } // for
       EbrLocations[partNum] = offset;