commit 236d17a7512afbe14c887b19c9dcbe7ad0813b1c
author android-build-team Robot <android-build-team-robot@google.com> Tue Jan 12 22:08:04 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jan 12 22:08:04 2021 +0000
tree ce6b61f5023d0a173a7b606df9b3edae217e2c22
parent 3e0439ae449e1db37e7fa620fd841c1f74c62b81
parent 0a14ea2a538d268aa243a24d415610577deaf789

Merge cherrypicks of [13326748, 13326765, 13326751, 13326753, 13326806, 13326807, 13326446, 13326845, 13326865, 13326885, 13326467, 13326686, 13326726, 13326905, 13326925, 13326945, 13326965, 13326966, 13326808, 13326809, 13326786, 13326766] into pi-wear-hmr1-dr-halibut-release

Change-Id: I09d868a6838c44f8fb2ff95571b43e5076281335

basicmbr.cc

diff --git a/basicmbr.cc b/basicmbr.cc
index 23f35b4..81e42ca 100644
--- a/basicmbr.cc
+++ b/basicmbr.cc
@@ -260,7 +260,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;