Browse Source

riff: dont discard truncated metadata

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.1
Michael Niedermayer 12 years ago
parent
commit
1350dffdc6
1 changed files with 2 additions and 6 deletions
  1. +2
    -6
      libavformat/riff.c

+ 2
- 6
libavformat/riff.c View File

@@ -777,7 +777,7 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size)

chunk_size += (chunk_size & 1);

value = av_malloc(chunk_size + 1);
value = av_mallocz(chunk_size + 1);
if (!value) {
av_log(s, AV_LOG_ERROR, "out of memory, unable to read INFO tag\n");
return AVERROR(ENOMEM);
@@ -786,13 +786,9 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size)
AV_WL32(key, chunk_code);

if (avio_read(pb, value, chunk_size) != chunk_size) {
av_freep(&value);
av_log(s, AV_LOG_ERROR, "premature end of file while reading INFO tag\n");
return AVERROR_INVALIDDATA;
av_log(s, AV_LOG_WARNING, "premature end of file while reading INFO tag\n");
}

value[chunk_size] = 0;

av_dict_set(&s->metadata, key, value, AV_DICT_DONT_STRDUP_VAL);
}



Loading…
Cancel
Save