Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE

Merged-In: I77e4f30cdea1d0e938a0693d70b27796294a75be
Change-Id: I45d2d1b2b51d7714187d23adc9a77ea70fe8581a
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;