aac: fix some signedness warnings

[paraslash.git] / vss.c

diff --git a/vss.c b/vss.c
index 8e9c17bf48a623bd883274ce5f58dfd6a463f264..a3c2e65063d267c26b20597f7ae5e1f8c81c24dc 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -268,7 +268,8 @@ static void vss_get_audio_file(void)
                audio_file = open(sl[i], O_RDONLY);
                if (audio_file < 0)
                        continue;
-               if (fstat(audio_file, &file_status) == -1) {
+               if (fstat(audio_file, &file_status) == -1 ||
+                               !file_status.st_size) {
                        close(audio_file);
                        continue;
                }
@@ -277,6 +278,7 @@ static void vss_get_audio_file(void)
                map = para_mmap(file_status.st_size, PROT_READ, MAP_PRIVATE,
                        audio_file, 0);
                strcpy(mmd->filename, sl[i]);
+               mmd->afi.header_len = 0; /* default: no header */
                if (update_mmd() < 0) { /* invalid file */
                        close(audio_file);
                        munmap(map, mmd->size);
@@ -383,8 +385,6 @@ static void vss_eof(void)
        mmd->afi.seconds_total = 0;
        free(mmd->afi.chunk_table);
        mmd->afi.chunk_table = NULL;
-       free(mmd->afi.header);
-       mmd->afi.header = NULL;
        tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_INFO1],
                status_item_list[SI_AUDIO_INFO2], status_item_list[SI_AUDIO_INFO3]);
        strcpy(mmd->afi.info_string, tmp);
@@ -410,10 +410,10 @@ static void vss_eof(void)
  */
 char *vss_get_header(int *header_len)
 {
-       if (mmd->audio_format < 0)
+       if (mmd->audio_format < 0 || !map || !mmd->afi.header_len)
                return NULL;
        *header_len = mmd->afi.header_len;
-       return mmd->afi.header;
+       return map + mmd->afi.header_offset;
 }
 
 /**