virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avcodec/jacosubdec: add some memory checks

Browse Source
This commit is contained in:
Clément Bœsch 2014-09-20 21:48:13 +02:00
parent d210c0e777
commit 4c85073044
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/jacosubdec.c
View File

@ -168,6 +168,7 @@ static void jacosub_to_ass(AVCodecContext *avctx, AVBPrint *dst, const char *src
static int jacosub_decode_frame(AVCodecContext *avctx,
void *data, int *got_sub_ptr, AVPacket *avpkt)
{
int ret;
AVSubtitle *sub = data;
const char *ptr = avpkt->data;
@ -176,7 +177,6 @@ static int jacosub_decode_frame(AVCodecContext *avctx,
if (*ptr) {
AVBPrint buffer;
char *dec_sub;
// skip timers
ptr = jss_skip_whitespace(ptr);
@ -185,9 +185,10 @@ static int jacosub_decode_frame(AVCodecContext *avctx,
av_bprint_init(&buffer, JSS_MAX_LINESIZE, JSS_MAX_LINESIZE);
jacosub_to_ass(avctx, &buffer, ptr);
av_bprint_finalize(&buffer, &dec_sub);
ff_ass_add_rect(sub, dec_sub, avpkt->pts, avpkt->duration, 0);
av_free(dec_sub);
ret = ff_ass_add_rect_bprint(sub, &buffer, avpkt->pts, avpkt->duration, 0);
av_bprint_finalize(&buffer, NULL);
if (ret < 0)
return ret;
}
end: