3 files changed, 28 insertions, 0 deletions
diff --git a/firmware/common/file.c b/firmware/common/file.c
index ea2471ae92..9cab001e8d 100644
--- a/firmware/common/file.c
+++ b/firmware/common/file.c
@@ -278,14 +278,22 @@ int fsync(int fd)
         if ( file->dirty ) {
             rc = flush_cache(fd);
             if (rc < 0)
+            {
+                /* when failing, try to close the file anyway */
+                fat_closewrite(&(file->fatfile), file->size, file->attr);
                 return rc * 10 - 3;
+            }
         }
 
         /* truncate? */
         if (file->trunc) {
             rc = ftruncate(fd, file->size);
             if (rc < 0)
+            {
+                /* when failing, try to close the file anyway */
+                fat_closewrite(&(file->fatfile), file->size, file->attr);
                 return rc * 10 - 4;
+            }
         }
 
         /* tie up all loose ends */
@@ -475,6 +483,10 @@ static int readwrite(int fd, void* buf, long count, bool write)
     struct filedesc* file = &openfiles[fd];
     int rc;
 
+    if (fd < 0 || fd > MAX_OPEN_FILES-1) {
+        errno = EINVAL;
+        return -1;
+    }
     if ( !file->busy ) {
         errno = EBADF;
         return -1;
@@ -643,6 +655,10 @@ off_t lseek(int fd, off_t offset, int whence)
 
     LDEBUGF("lseek(%d,%ld,%d)\n",fd,offset,whence);
 
+    if (fd < 0 || fd > MAX_OPEN_FILES-1) {
+        errno = EINVAL;
+        return -1;
+    }
     if ( !file->busy ) {
         errno = EBADF;
         return -1;
@@ -716,6 +732,10 @@ off_t filesize(int fd)
 {
     struct filedesc* file = &openfiles[fd];
 
+    if (fd < 0 || fd > MAX_OPEN_FILES-1) {
+        errno = EINVAL;
+        return -1;
+    }
     if ( !file->busy ) {
         errno = EBADF;
         return -1;
@@ -743,3 +763,4 @@ int release_files(int volume)
     return closed; /* return how many we did */
 }
 #endif /* #ifdef HAVE_HOTSWAP */
+
diff --git a/firmware/drivers/fat.c b/firmware/drivers/fat.c
index f117119258..a4fa7aa933 100644
--- a/firmware/drivers/fat.c
+++ b/firmware/drivers/fat.c
@@ -2084,6 +2084,8 @@ long fat_readwrite( struct fat_file *file, long sectorcount,
         numsec++;
         if ( numsec > (long)fat_bpb->bpb_secperclus || !cluster ) {
             long oldcluster = cluster;
+            long oldsector = sector;
+            long oldnumsec = numsec;
             if (write)
                 cluster = next_write_cluster(file, cluster, &sector);
             else {
@@ -2099,7 +2101,9 @@ long fat_readwrite( struct fat_file *file, long sectorcount,
                 if ( write ) {
                     /* remember last cluster, in case 
                        we want to append to the file */
+                    sector = oldsector;
                     cluster = oldcluster;
+                    numsec = oldnumsec;
                     clusternum--;
                     i = -1; /* Error code */
                     break;
diff --git a/firmware/pcm_record.c b/firmware/pcm_record.c
index ac12fe2ba0..361689de3a 100644
--- a/firmware/pcm_record.c
+++ b/firmware/pcm_record.c
@@ -901,7 +901,10 @@ static void pcmrec_flush(unsigned flush_num)
         INC_ENC_INDEX(enc_rd_index);
 
         if (errors != 0)
+        {
+            pcmrec_end_file();
             break;
+        }
 
         if (flush_num == PCMREC_FLUSH_MINI &&
                 ++chunks_flushed >= MINI_CHUNKS)