From c75a34ba9fe49664b893d5f9fd0b4f6b09c87079 Mon Sep 17 00:00:00 2001
From: thomasjfox <thomasjfox@a1c6a512-1295-4272-9138-f99709370657>
Date: Fri, 18 Feb 2011 21:21:50 +0000
Subject: [PATCH] Fix off-by-one buffer read access in format_track_path().
 Part of #11947

We need to check for "i < max" first.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29324 a1c6a512-1295-4272-9138-f99709370657
---
 apps/playlist.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/playlist.c b/apps/playlist.c
index 6f6db27b2..3bbe8b2f9 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -1660,9 +1660,9 @@ static int format_track_path(char *dest, char *src, int buf_length, int max,
     char *temp_ptr;
 
     /* Zero-terminate the file name */
-    while((src[i] != '\n') &&
-          (src[i] != '\r') &&
-          (i < max))
+    while((i < max) &&
+          (src[i] != '\n') &&
+          (src[i] != '\r'))
         i++;
 
     /* Now work back killing white space */
-- 
2.11.4.GIT