X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=4f201d97fd015712dafd2cd555fe8a03edd44623;hb=1101077a226b09854650662759bf12caf7c84f8d;hp=67f337dba80a195af5b8520f6afd220c35a7311f;hpb=4e3bc17b6150a17a76cba2da2daa96af65bde5b9;p=rocksndiamonds.git

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 67f337db..4f201d97 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -808,7 +808,7 @@ void putFileChunk(FILE *file, char *chunk_name, int chunk_size,
 
 void ReadUnusedBytesFromFile(FILE *file, unsigned long bytes)
 {
-  while (bytes--)
+  while (bytes-- && !feof(file))
     fgetc(file);
 }
 
@@ -1174,22 +1174,22 @@ boolean FileIsGraphic(char *filename)
   return FALSE;
 }
 
-boolean FileIsSound(char *filename)
+boolean FileIsSound(char *basename)
 {
-  if (strlen(filename) > 4 &&
-      strcmp(&filename[strlen(filename) - 4], ".wav") == 0)
+  if (strlen(basename) > 4 &&
+      strcmp(&basename[strlen(basename) - 4], ".wav") == 0)
     return TRUE;
 
   return FALSE;
 }
 
-boolean FileIsMusic(char *filename)
+boolean FileIsMusic(char *basename)
 {
-  if (strlen(filename) > 4 &&
-      (strcmp(&filename[strlen(filename) - 4], ".mod") == 0 ||
-       strcmp(&filename[strlen(filename) - 4], ".MOD") == 0 ||
-       strncmp(filename, "mod.", 4) == 0 ||
-       strncmp(filename, "MOD.", 4) == 0))
+  if (strlen(basename) > 4 &&
+      (strcmp(&basename[strlen(basename) - 4], ".mod") == 0 ||
+       strcmp(&basename[strlen(basename) - 4], ".MOD") == 0 ||
+       strncmp(basename, "mod.", 4) == 0 ||
+       strncmp(basename, "MOD.", 4) == 0))
     return TRUE;
 
   return FALSE;