commit 9496945d0ded76031cb129de65be425cfa971673
author The Android Automerger <android-build@android.com> Mon May 09 10:40:33 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 09 10:40:33 2011 -0700
tree 01217ed185973b73e01417104b34a6d2b1abbc5a
parent c13e0967debb6b5a817004e9184e6d3466c42813
parent 4e00f1fa4d4e82bba4afe1c2a21bf0a56b3a4c8f

am 4e00f1fa: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE

* commit '4e00f1fa4d4e82bba4afe1c2a21bf0a56b3a4c8f':
  DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.
  DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW

DirectVolume.cpp

diff --git a/DirectVolume.cpp b/DirectVolume.cpp
index 3191cc7..54da964 100644
--- a/DirectVolume.cpp
+++ b/DirectVolume.cpp
@@ -186,6 +186,11 @@
         part_num = 1;
     }
 
+    if (part_num > MAX_PARTITIONS || part_num < 1) {
+        SLOGW("Invalid 'PARTN' value");
+        part_num = 1;
+    }
+
     if (part_num > mDiskNumParts) {
         mDiskNumParts = part_num;
     }