highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '522d971c7f5921bebcea2fc50e67056afdabb951'

Browse Source 
* commit '522d971c7f5921bebcea2fc50e67056afdabb951':
  xsub: Check memory allocation

Conflicts:
	libavcodec/xsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-01 02:46:56 +02:00
parent 1dc58965fd 522d971c7f
commit 211dcdca5c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/xsubdec.c
View File

@@ -109,10 +109,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
sub->rects[0]->nb_colors = 4; sub->rects[0]->nb_colors = 4;
sub->rects[0]->pict.data[1] = av_mallocz(AVPALETTE_SIZE); sub->rects[0]->pict.data[1] = av_mallocz(AVPALETTE_SIZE);
if (!sub->rects[0]->pict.data[0] || !sub->rects[0]->pict.data[1]) { if (!sub->rects[0]->pict.data[0] || !sub->rects[0]->pict.data[1]) {
av_freep(&sub->rects[0]->pict.data[1]);
av_freep(&sub->rects[0]->pict.data[0]);
av_freep(&sub->rects[0]); av_freep(&sub->rects[0]);
av_freep(&sub->rects); av_freep(&sub->rects);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
sub->num_rects = 1; sub->num_rects = 1;