commit 696378a4b0650cea206ac13267aeb051350c881c
author android-build-team Robot <android-build-team-robot@google.com> Wed Nov 18 18:33:05 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Nov 18 18:33:05 2020 +0000
tree 869249bbe6844741362dde911c3ed32947641cb8
parent cbd6b188d898c0b5f45f6a9dd00e7338c68b3a38
parent d51a13ed28951299cdadd83ffe3d2b6df58d337a

Snap for 6981242 from d51a13ed28951299cdadd83ffe3d2b6df58d337a to mainline-release

Change-Id: I3928eab72a138b6419fbcdf031dce7bce800f65a

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;