X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=vss.c;h=a3c2e65063d267c26b20597f7ae5e1f8c81c24dc;hb=65616923d1789af7df70b7db7e62bbe5d2a03c22;hp=cb2d16c8d0c84843de9f5be213ed09b752aee890;hpb=a15abef9eee4b8369b3ce8fcaad91a2e0c879df5;p=paraslash.git diff --git a/vss.c b/vss.c index cb2d16c8..a3c2e650 100644 --- a/vss.c +++ b/vss.c @@ -278,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); @@ -384,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); @@ -411,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; } /**