generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/dvbsubdec: Cleanup on *malloc failure

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-12 17:28:53 +01:00
parent e74e14608f
commit 39dfe6801a
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavcodec/dvbsubdec.c
View File

@ -762,6 +762,7 @@ static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_ou
uint32_t *clut_table; uint32_t *clut_table;
int i; int i;
int offset_x=0, offset_y=0; int offset_x=0, offset_y=0;
int ret = 0;
if (display_def) { if (display_def) {
@ -790,8 +791,10 @@ static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_ou
if (sub->num_rects > 0) { if (sub->num_rects > 0) {
sub->rects = av_mallocz_array(sizeof(*sub->rects), sub->num_rects); sub->rects = av_mallocz_array(sizeof(*sub->rects), sub->num_rects);
if (!sub->rects) if (!sub->rects) {
return AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail;
}
for(i=0; i<sub->num_rects; i++) for(i=0; i<sub->num_rects; i++)
sub->rects[i] = av_mallocz(sizeof(*sub->rects[i])); sub->rects[i] = av_mallocz(sizeof(*sub->rects[i]));
@ -836,16 +839,15 @@ static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_ou
rect->pict.data[1] = av_mallocz(AVPALETTE_SIZE); rect->pict.data[1] = av_mallocz(AVPALETTE_SIZE);
if (!rect->pict.data[1]) { if (!rect->pict.data[1]) {
av_freep(&sub->rects); ret = AVERROR(ENOMEM);
return AVERROR(ENOMEM); goto fail;
} }
memcpy(rect->pict.data[1], clut_table, (1 << region->depth) * sizeof(uint32_t)); memcpy(rect->pict.data[1], clut_table, (1 << region->depth) * sizeof(uint32_t));
rect->pict.data[0] = av_malloc(region->buf_size); rect->pict.data[0] = av_malloc(region->buf_size);
if (!rect->pict.data[0]) { if (!rect->pict.data[0]) {
av_freep(&rect->pict.data[1]); ret = AVERROR(ENOMEM);
av_freep(&sub->rects); goto fail;
return AVERROR(ENOMEM);
} }
memcpy(rect->pict.data[0], region->pbuf, region->buf_size); memcpy(rect->pict.data[0], region->pbuf, region->buf_size);
@ -855,6 +857,20 @@ static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_ou
} }
return 0; return 0;
fail:
if (sub->rects) {
for(i=0; i<sub->num_rects; i++) {
rect = sub->rects[i];
if (rect) {
av_freep(&rect->pict.data[0]);
av_freep(&rect->pict.data[1]);
}
av_freep(&sub->rects[i]);
}
av_freep(&sub->rects);
}
sub->num_rects = 0;
return ret;
} }
static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDisplay *display, static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDisplay *display,