Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avformat/vqf: Propagate errors from add_metadata()

Browse source 
Suggested-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2024-12-31 04:13:25 +01:00
parent c43dbecbda
commit 49fa3f6c5b
No known key found for this signature in database
GPG key ID: B18E8928B3948D64
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libavformat/vqf.c
View file

@ -51,23 +51,28 @@ static int vqf_probe(const AVProbeData *probe_packet)
return AVPROBE_SCORE_EXTENSION; return AVPROBE_SCORE_EXTENSION;
} }
static void add_metadata(AVFormatContext *s, uint32_t tag, static int add_metadata(AVFormatContext *s, uint32_t tag,
unsigned int tag_len, unsigned int remaining) unsigned int tag_len, unsigned int remaining)
{ {
int len = FFMIN(tag_len, remaining); int len = FFMIN(tag_len, remaining);
char *buf, key[5] = {0}; char *buf, key[5] = {0};
int ret;
if (len == UINT_MAX) if (len == UINT_MAX)
return; return AVERROR_INVALIDDATA;
buf = av_malloc(len+1); buf = av_malloc(len+1);
if (!buf) if (!buf)
return; return AVERROR(ENOMEM);
if (len != avio_read(s->pb, buf, len))
return; ret = avio_read(s->pb, buf, len);
if (ret < 0)
return ret;
if (len != ret)
return AVERROR_INVALIDDATA;
buf[len] = 0; buf[len] = 0;
AV_WL32(key, tag); AV_WL32(key, tag);
av_dict_set(&s->metadata, key, buf, AV_DICT_DONT_STRDUP_VAL); return av_dict_set(&s->metadata, key, buf, AV_DICT_DONT_STRDUP_VAL);
} }
static const AVMetadataConv vqf_metadata_conv[] = { static const AVMetadataConv vqf_metadata_conv[] = {
@ -165,7 +170,9 @@ static int vqf_read_header(AVFormatContext *s)
avio_skip(s->pb, FFMIN(len, header_size)); avio_skip(s->pb, FFMIN(len, header_size));
break; break;
default: default:
add_metadata(s, chunk_tag, len, header_size); ret = add_metadata(s, chunk_tag, len, header_size);
if (ret < 0)
return ret;
break; break;
} }