RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/srtdec: add some memory checks

This commit is contained in:
Clément Bœsch 2014-09-20 22:14:11 +02:00
parent 6a65da3a18
commit 592716227c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/srtdec.c
View File

@ -223,7 +223,7 @@ static int srt_decode_frame(AVCodecContext *avctx,
char buffer[2048];
const char *ptr = avpkt->data;
const char *end = avpkt->data + avpkt->size;
int size;
int size, ret;
const uint8_t *p = av_packet_get_side_data(avpkt, AV_PKT_DATA_SUBTITLE_POSITION, &size);
if (p && size == 16) {
@ -252,7 +252,9 @@ static int srt_decode_frame(AVCodecContext *avctx,
}
ptr = srt_to_ass(avctx, buffer, buffer+sizeof(buffer), ptr,
x1, y1, x2, y2);
ff_ass_add_rect(sub, buffer, ts_start, ts_end-ts_start, 0);
ret = ff_ass_add_rect(sub, buffer, ts_start, ts_end-ts_start, 0);
if (ret < 0)
return ret;
}
*got_sub_ptr = sub->num_rects > 0;