har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

riff: dont discard truncated metadata

Browse Source 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-18 04:57:27 +02:00
parent 3777e6b3bf
commit 1350dffdc6
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/riff.c
View File

@ -777,7 +777,7 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size)
chunk_size += (chunk_size & 1); chunk_size += (chunk_size & 1);
value = av_malloc(chunk_size + 1); value = av_mallocz(chunk_size + 1);
if (!value) { if (!value) {
av_log(s, AV_LOG_ERROR, "out of memory, unable to read INFO tag\n"); av_log(s, AV_LOG_ERROR, "out of memory, unable to read INFO tag\n");
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -786,13 +786,9 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size)
AV_WL32(key, chunk_code); AV_WL32(key, chunk_code);
if (avio_read(pb, value, chunk_size) != chunk_size) { if (avio_read(pb, value, chunk_size) != chunk_size) {
av_freep(&value); av_log(s, AV_LOG_WARNING, "premature end of file while reading INFO tag\n");
av_log(s, AV_LOG_ERROR, "premature end of file while reading INFO tag\n");
return AVERROR_INVALIDDATA;
} }
value[chunk_size] = 0;
av_dict_set(&s->metadata, key, value, AV_DICT_DONT_STRDUP_VAL); av_dict_set(&s->metadata, key, value, AV_DICT_DONT_STRDUP_VAL);
} }