commit c9868a58abd2db670ead870c4c14d19dacb25541
author Karsten Tausche <karsten@fairphone.com> Wed Jan 20 10:09:57 2021 +0100
committer Karsten Tausche <karsten@fairphone.com> Wed Jan 20 10:09:57 2021 +0100
tree ce6b61f5023d0a173a7b606df9b3edae217e2c22
parent 40ea2044e4ee2dc0fa655809a66e58df942f8b2f
parent 7e160fb8dc3d02c4813d2c35b0e0c7d2968b3219

Merge the 2021-02-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  RESTRICT AUTOMERGE ANDROID: Fix negative stack write in sgdisk

Change-Id: I5bf5f34928133c577a86521c86c84fbde3b947b1

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;