commit 7877388b6c65c4819e436141ccc519161b719bec
author Mike Lockwood <lockwood@android.com> Wed May 04 08:53:25 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 04 08:53:25 2011 -0700
tree 47a8dbe9f84e3304f6f80129e01db715474f9f09
parent 3368f167578fcd2ef024e6d8da723f349089fa7c
parent f4cd1c6b1912d2481334152f7dec50067960a90c

am f4cd1c6b: DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW

* commit 'f4cd1c6b1912d2481334152f7dec50067960a90c':
  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;
     }