commit d11b833201ae72265d52d606fa084841b44e9a65
author Bruce Beare <brucex.j.beare@intel.com> Thu Jul 22 13:23:33 2010 -0700
committer David 'Digit' Turner <digit@google.com> Thu Jun 09 17:39:19 2011 +0200
tree 4a02ce01d70e45634ff55d496ed8d39364ee8eb2
parent c51920c82463b240e2be0430849837d6fdc5352e

Avoid array overrun. We can now mount the /sdcard partition on our boot sdcards

Orig-Change-Id: I6e9db8c55db49b4aa61dd40cd59495f55e5b3368
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>

DirectVolume.cpp

diff --git a/DirectVolume.cpp b/DirectVolume.cpp
index 0ac1a0c..a570a73 100644
--- a/DirectVolume.cpp
+++ b/DirectVolume.cpp
@@ -202,9 +202,13 @@
 #ifdef PARTITION_DEBUG
     SLOGD("Dv:partAdd: part_num = %d, minor = %d\n", part_num, minor);
 #endif
-    mPartMinors[part_num -1] = minor;
-
+    if (part_num >= MAX_PARTITIONS) {
+        SLOGE("Dv:partAdd: ignoring part_num = %d (max: %d)\n", part_num, MAX_PARTITIONS-1);
+    } else {
+        mPartMinors[part_num -1] = minor;
+    }
     mPendingPartMap &= ~(1 << part_num);
+
     if (!mPendingPartMap) {
 #ifdef PARTITION_DEBUG
         SLOGD("Dv:partAdd: Got all partitions - ready to rock!");