RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/vorbiscomment: Check entry length in ff_vorbiscomment_write() 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit eca38864a6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-11 15:23:51 +02:00
parent 618c7a91ee
commit 27a0dab914
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/vorbiscomment.c
View File

@ -61,8 +61,10 @@ int ff_vorbiscomment_write(uint8_t **p, AVDictionary **m,
AVDictionaryEntry *tag = NULL; AVDictionaryEntry *tag = NULL;
bytestream_put_le32(p, count); bytestream_put_le32(p, count);
while ((tag = av_dict_get(*m, "", tag, AV_DICT_IGNORE_SUFFIX))) { while ((tag = av_dict_get(*m, "", tag, AV_DICT_IGNORE_SUFFIX))) {
unsigned int len1 = strlen(tag->key); int64_t len1 = strlen(tag->key);
unsigned int len2 = strlen(tag->value); int64_t len2 = strlen(tag->value);
if (len1+1+len2 > UINT32_MAX)
return AVERROR(EINVAL);
bytestream_put_le32(p, len1+1+len2); bytestream_put_le32(p, len1+1+len2);
bytestream_put_buffer(p, tag->key, len1); bytestream_put_buffer(p, tag->key, len1);
bytestream_put_byte(p, '='); bytestream_put_byte(p, '=');