diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-07-14 09:18:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-14 09:18:29 -0700 |
| commit | 6c190fd326099d8315e194b0ad0a173e21146e14 (patch) | |
| tree | 2046748a94bb5ce6eae4710cefe6dde848ee4aa8 /DirectVolume.cpp | |
| parent | 273d3549198d144331f3e502eeb1215417d72b16 (diff) | |
| parent | 137858b43b7e0ed46fb8ebce9230eb40f0a62432 (diff) | |
| download | android_system_vold-6c190fd326099d8315e194b0ad0a173e21146e14.tar.gz android_system_vold-6c190fd326099d8315e194b0ad0a173e21146e14.tar.bz2 android_system_vold-6c190fd326099d8315e194b0ad0a173e21146e14.zip | |
am 137858b4: resolved conflicts for merge of 5284bcff to gingerbread-plus-aosp
* commit '137858b43b7e0ed46fb8ebce9230eb40f0a62432':
Avoid array overrun. We can now mount the /sdcard partition on our boot sdcards
Diffstat (limited to 'DirectVolume.cpp')
| -rw-r--r-- | DirectVolume.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/DirectVolume.cpp b/DirectVolume.cpp index 54da964..557b365 100644 --- a/DirectVolume.cpp +++ b/DirectVolume.cpp @@ -202,8 +202,8 @@ void DirectVolume::handlePartitionAdded(const char *devpath, NetlinkEvent *evt) #ifdef PARTITION_DEBUG SLOGD("Dv:partAdd: part_num = %d, minor = %d\n", part_num, minor); #endif - if (part_num > MAX_PARTITIONS) { - SLOGE("Dv:partAdd: ignoring part_num = %d (max: %d)\n", part_num, MAX_PARTITIONS); + 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; } |