Data at end of file was not being read if last sector fell on cluster boundary

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1968 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 8 insertions, 7 deletions

diff --git a/firmware/drivers/fat.c b/firmware/drivers/fat.c
index 6f82f5a..877beff 100644
--- a/firmware/drivers/fat.c
+++ b/firmware/drivers/fat.c
@@ -888,20 +888,21 @@ int fat_read( struct fat_file *file, int sectorcount, void* buf )
         return 0;
 
     /* find sequential sectors and read them all at once */
-    for (i=0; i<sectorcount; i++ ) {
+    for (i=0; i<sectorcount && sector>0; i++ ) {
         numsec++;
         if ( numsec >= fat_bpb.bpb_secperclus ) {
             cluster = get_next_cluster(cluster);
             if (!cluster) {
                 /* end of file */
                 sector = -1;
-                break;
             }
-            
-            sector = cluster2sec(cluster);
-            if (sector<0)
-                return -1;
-            numsec=0;
+            else
+            {
+                sector = cluster2sec(cluster);
+                if (sector<0)
+                    return -1;
+                numsec=0;
+            }
         }
         else
             sector++;