diff options
| author | Kenny Root <kroot@google.com> | 2010-02-18 09:25:49 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-02-18 09:26:47 -0800 |
| commit | eb03f13fd3b5a4b1060cd55881934ff9c918fe8c (patch) | |
| tree | d99c5ddc4313f326d5dffde3ee56710a24450360 /media/libmedia/MediaScanner.cpp | |
| parent | 349a733b58c3b4c656c4ddfa8cbbb06c008d3bc5 (diff) | |
| download | frameworks_av-eb03f13fd3b5a4b1060cd55881934ff9c918fe8c.zip frameworks_av-eb03f13fd3b5a4b1060cd55881934ff9c918fe8c.tar.gz frameworks_av-eb03f13fd3b5a4b1060cd55881934ff9c918fe8c.tar.bz2 | |
Range check in MediaScanner::processDirectory
Make sure we don't have an empty string before checking if it's a
directory since this string is tainted.
Change-Id: I5eb310ced58c3c64a7af2d11b80326efe5adbcab
Diffstat (limited to 'media/libmedia/MediaScanner.cpp')
| -rw-r--r-- | media/libmedia/MediaScanner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ status_t MediaScanner::processDirectory( 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; |