diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-07-14 10:56:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-14 10:56:08 -0700 |
| commit | 5bf00e62a2995473140f4277f08ee8918a7fba26 (patch) | |
| tree | 99dfbfc90cabf2bbcf207096f96318373f6f0ada /DirectVolume.cpp | |
| parent | 81893259c97a0a5efb804387088f257ac4eb6296 (diff) | |
| parent | 6c190fd326099d8315e194b0ad0a173e21146e14 (diff) | |
| download | android_system_vold-5bf00e62a2995473140f4277f08ee8918a7fba26.tar.gz android_system_vold-5bf00e62a2995473140f4277f08ee8918a7fba26.tar.bz2 android_system_vold-5bf00e62a2995473140f4277f08ee8918a7fba26.zip | |
am 6c190fd3: am 137858b4: resolved conflicts for merge of 5284bcff to gingerbread-plus-aosp
* commit '6c190fd326099d8315e194b0ad0a173e21146e14':
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 fa3eb9a..2ddd5ab 100644 --- a/DirectVolume.cpp +++ b/DirectVolume.cpp @@ -207,8 +207,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; } |