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

dvbsubdec: Free subrect memory on allocation error 

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Vittorio Giovara 2017-06-13 11:35:16 -04:00
parent 1cfd566324
commit a594f17f83
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/dvbsubdec.c
View File

@ -1293,6 +1293,10 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf,
for (i = 0; i < sub->num_rects; i++) {
sub->rects[i] = av_mallocz(sizeof(*sub->rects[i]));
if (!sub->rects[i]) {
int j;
for (j = 0; j < i; j ++)
av_free(sub->rects[j]);
av_free(sub->rects);
return AVERROR(ENOMEM);
}
}
@ -1335,6 +1339,8 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf,
rect->data[1] = av_mallocz(AVPALETTE_SIZE);
if (!rect->data[1]) {
for (i = 0; i < sub->num_rects; i++)
av_free(sub->rects[i]);
av_free(sub->rects);
return AVERROR(ENOMEM);
}
@ -1343,6 +1349,8 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf,
rect->data[0] = av_malloc(region->buf_size);
if (!rect->data[0]) {
av_free(rect->data[1]);
for (i = 0; i < sub->num_rects; i++)
av_free(sub->rects[i]);
av_free(sub->rects);
return AVERROR(ENOMEM);
}