commit a8c02d77e492798356141ddc128e365aeed61064
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 b23b4ac095caaf05b6423fcc0b7c571a56bc0319
parent 650e22ca3a97501e12f4befb80f2cd5b39ea78bc

Fix regression in directory scanning

Previous range-checking fix removed an inequality check. This change
restores it.

Offending change was I5eb310ced58c3c64a7af2d11b80326efe5adbcab

Change-Id: Ic952c3ba5a4f7e5ab2148ec623b6f083cb7495fb

media/libmedia/MediaScanner.cpp

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;