diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-11 15:30:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-21 20:43:38 +0200 |
| commit | cb1ecf08b2e7078a58a4a99991ff08b129e424d7 (patch) | |
| tree | f044292845cdecd45786fb05cb99047ecccfcfd1 | |
| parent | e3d9bf1151c96e23815e90c65a028b05f5e752af (diff) | |
| download | ffmpeg-cb1ecf08b2e7078a58a4a99991ff08b129e424d7.tar.gz | |
avformat/flacenc: Check length in flac_write_block_comment()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 40a7700b82aec0036622f8673ce64e070a520891)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/flacenc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index 0eea94288f..aeac70ba4b 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -50,12 +50,14 @@ static int flac_write_block_comment(AVIOContext *pb, AVDictionary **m, int last_block, int bitexact) { const char *vendor = bitexact ? "ffmpeg" : LIBAVFORMAT_IDENT; - unsigned int len; + int64_t len; uint8_t *p, *p0; ff_metadata_conv(m, ff_vorbiscomment_metadata_conv, NULL); len = ff_vorbiscomment_length(*m, vendor); + if (len >= ((1<<24) - 4)) + return AVERROR(EINVAL); p0 = av_malloc(len+4); if (!p0) return AVERROR(ENOMEM); |