diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-11 15:23:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 02:13:11 +0200 |
| commit | db0c4d2e3c7079c2d854e258b494b39a55b84a90 (patch) | |
| tree | 61ac6252951118e5d404bcf5d447f60f577940cd | |
| parent | fdc62caf3075d02c0a65368cd43c98dde04e4185 (diff) | |
| download | ffmpeg-db0c4d2e3c7079c2d854e258b494b39a55b84a90.tar.gz | |
avformat/vorbiscomment: Check entry length in ff_vorbiscomment_write()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit eca38864a6ce5053e463b8d3fc22b22bc9a49578)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/vorbiscomment.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/vorbiscomment.c b/libavformat/vorbiscomment.c index 9b38e6a791..df5171dad9 100644 --- a/libavformat/vorbiscomment.c +++ b/libavformat/vorbiscomment.c @@ -62,8 +62,10 @@ int ff_vorbiscomment_write(uint8_t **p, AVDictionary **m, AVDictionaryEntry *tag = NULL; bytestream_put_le32(p, count); while ((tag = av_dict_get(*m, "", tag, AV_DICT_IGNORE_SUFFIX))) { - unsigned int len1 = strlen(tag->key); - unsigned int len2 = strlen(tag->value); + int64_t len1 = strlen(tag->key); + int64_t len2 = strlen(tag->value); + if (len1+1+len2 > UINT32_MAX) + return AVERROR(EINVAL); bytestream_put_le32(p, len1+1+len2); bytestream_put_buffer(p, tag->key, len1); bytestream_put_byte(p, '='); |