X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fwav.c;h=ff577c702825fed4a75e90ef8065d43021f79b52;hp=72d95025f319ebb066f28d439418c0b99dc20bff;hb=bf04757cd94e94c1f67fa3d2a4e3e59fa5bce0c0;hpb=3ef17c4cee41231e1eed731c08381d3ddf0c8d1a

diff --git a/lib/wav.c b/lib/wav.c
index 72d9502..ff577c7 100644
--- a/lib/wav.c
+++ b/lib/wav.c
@@ -46,7 +46,7 @@ int getWAVBlock(FILE*fi, struct WAVBlock*block)
     return 1;
 }
 
-int wav_read(struct WAV*wav, char* filename)
+int wav_read(struct WAV*wav, const char* filename)
 {
     FILE*fi = fopen(filename, "rb");
     unsigned char b[16];
@@ -89,7 +89,7 @@ int wav_read(struct WAV*wav, char* filename)
         fclose(fi);
 		return 0;
     }
-    if(strncmp(b, "WAVE", 4))
+    if(strncmp((const char*)b, "WAVE", 4))
     {
         fprintf(stderr, "wav_read: not a WAV file (2)\n");
         fclose(fi);
@@ -123,7 +123,7 @@ int wav_read(struct WAV*wav, char* filename)
                 if (!strncmp(block.id, "data", 4))
                 {
                     int l;
-                    wav->data = malloc(block.size);
+                    wav->data = (unsigned char*)malloc(block.size);
                     if(!wav->data)
                     {
                         fprintf(stderr, "Out of memory (%d bytes needed)", block.size);
@@ -131,13 +131,17 @@ int wav_read(struct WAV*wav, char* filename)
                         return 0;
                     }
                     l = fread(wav->data, 1, block.size, fi);
-                    if(l < block.size)
-                    {
-                        fprintf(stderr, "Error while reading data block of size %d (%d bytes missing)", block.size, block.size-l);
+                    if(l<=0) {
+                        fprintf(stderr, "Error: Couldn't read WAV data block\n");
                         fclose(fi);
                         return 0;
+                    } else if(l < block.size)
+                    {
+                        fprintf(stderr, "Warning: data block of size %d is only %d bytes (%d bytes missing)\n", block.size, l, block.size-l);
+                        wav->size = l;
+                    } else {
+                        wav->size = block.size;
                     }
-                    wav->size = block.size;
                 }
                 pos+=block.size;
                 fseek(fi, pos, SEEK_SET);
@@ -147,7 +151,7 @@ int wav_read(struct WAV*wav, char* filename)
     return 1;
 }
 
-int wav_write(struct WAV*wav, char*filename)
+int wav_write(struct WAV*wav, const char*filename)
 {
     FILE*fi = fopen(filename, "wb");
     char*b="RIFFWAVEfmt \x10\0\0\0data";