avformat/oggenc: Check ff_vorbiscomment_length in ogg_write_vorbiscomment()

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-11 15:34:28 +02:00
parent 02fe112c7c
commit 9193fd9ddf
1 changed files with 4 additions and 2 deletions

View File

@ -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;