From 3e42b4491529975f771f8d71f931e24e120a7856 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Mon, 15 Mar 2010 21:17:08 -0700
Subject: 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '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 @@ status_t MediaScanner::processDirectory(
 
     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;
-- 
cgit v1.1