diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-11 15:34:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 23:25:20 +0200 |
| commit | 9193fd9ddfa44b282a9d18fdd3f934176254f0b2 (patch) | |
| tree | 4a3968fadcab588366ace0cea0452db967b6164b | |
| parent | 02fe112c7c00283bcd4f4edbfe4a09d3cf60def1 (diff) | |
| download | ffmpeg-9193fd9ddfa44b282a9d18fdd3f934176254f0b2.tar.gz | |
avformat/oggenc: Check ff_vorbiscomment_length in ogg_write_vorbiscomment()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0db5b2b9f8a96298eeba7988d43c4eb44220fab3)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/oggenc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 4a54126f8f..bfa9a25edc 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -279,16 +279,18 @@ static int ogg_buffer_data(AVFormatContext *s, AVStream *st, return 0; } -static uint8_t *ogg_write_vorbiscomment(int offset, int bitexact, +static uint8_t *ogg_write_vorbiscomment(int64_t offset, int bitexact, int *header_len, AVDictionary **m, int framing_bit) { const char *vendor = bitexact ? "ffmpeg" : LIBAVFORMAT_IDENT; - int size; + int64_t size; uint8_t *p, *p0; ff_metadata_conv(m, ff_vorbiscomment_metadata_conv, NULL); size = offset + ff_vorbiscomment_length(*m, vendor) + framing_bit; + if (size > INT_MAX) + return NULL; p = av_mallocz(size); if (!p) return NULL; |