| commit | 3e42b4491529975f771f8d71f931e24e120a7856 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Mar 15 21:17:08 2010 -0700 |
| committer | Kenny Root <kroot@google.com> | Mon Mar 15 21:17:40 2010 -0700 |
| tree | 9a37efbc1808b2b9ff7dd1081aa3308c287d0e2d | |
| parent | 746973186764292a84d11856ac315fa4b62957ad [diff] [blame] |
Fix regression in directory scanning Previous range-checking fix removed an inequality check. This change restores it. Offending change was I5eb310ced58c3c64a7af2d11b80326efe5adbcab Change-Id: Ic952c3ba5a4f7e5ab2148ec623b6f083cb7495fb
diff --git a/media/libmedia/MediaScanner.cpp b/media/libmedia/MediaScanner.cpp index 43762e7..843a8fd 100644 --- a/media/libmedia/MediaScanner.cpp +++ b/media/libmedia/MediaScanner.cpp
@@ -58,7 +58,7 @@ int pathRemaining = PATH_MAX - pathLength; strcpy(pathBuffer, path); - if (pathLength > 0 && pathBuffer[pathLength - 1]) { + if (pathLength > 0 && pathBuffer[pathLength - 1] != '/') { pathBuffer[pathLength] = '/'; pathBuffer[pathLength + 1] = 0; --pathRemaining;