commit 6f3610fefaddccf1d2860c098dbd14d81fe74633
author android-build-team Robot <android-build-team-robot@google.com> Thu Nov 19 18:53:59 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Nov 19 18:53:59 2020 +0000
tree 964e6c7c72c0dcd934a5044f318c850f6632569e
parent ba87d75bab53f87ed30492f8096c881d7116ffef
parent f40376014076c0cc2b25ad343ca44dc345db7db5

Snap for 6983956 from f40376014076c0cc2b25ad343ca44dc345db7db5 to qt-aml-tzdata-release

Change-Id: Idfa7b5bc6d3647faad5cb6dc6587a071a3b4647c

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;