| commit | 1f71e77facd0a2b39f4a0be7fa52850533cc121f | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Feb 18 09:36:08 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 18 09:36:08 2010 -0800 |
| tree | 4a6554efb44705fa4a11047e52297e89e32c0d25 | |
| parent | e307dd2d8309a1f49de9a079a3f33cb063c10b24 [diff] | |
| parent | eb03f13fd3b5a4b1060cd55881934ff9c918fe8c [diff] |
Merge "Range check in MediaScanner::processDirectory"
diff --git a/media/libmedia/MediaScanner.cpp b/media/libmedia/MediaScanner.cpp index f201667..43762e7 100644 --- a/media/libmedia/MediaScanner.cpp +++ b/media/libmedia/MediaScanner.cpp
@@ -58,7 +58,7 @@ int pathRemaining = PATH_MAX - pathLength; strcpy(pathBuffer, path); - if (pathBuffer[pathLength - 1] != '/') { + if (pathLength > 0 && pathBuffer[pathLength - 1]) { pathBuffer[pathLength] = '/'; pathBuffer[pathLength + 1] = 0; --pathRemaining;