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

Merge commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8'

Browse Source 
* commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8':
  dvbsubdec: improve error checking

Conflicts:
	libavcodec/dvbsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-11 22:19:54 +01:00
commit 4809ac75fc
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/dvbsubdec.c
View File

@ -796,6 +796,9 @@ 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)
return AVERROR(ENOMEM);
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]));
@ -838,9 +841,19 @@ 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]) {
av_free(sub->rects);
return AVERROR(ENOMEM);
}
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]) {
av_free(rect->pict.data[1]);
av_free(sub->rects);
return AVERROR(ENOMEM);
}
memcpy(rect->pict.data[0], region->pbuf, region->buf_size); memcpy(rect->pict.data[0], region->pbuf, region->buf_size);
i++; i++;