ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jan 19 17:15:15 2015 +0100| [f9a5a89bbfdef991523921f4733217009946eec4] | committer: Michael Niedermayer
avcodec/xsubdec: Check av_mallocz() return codes Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9a5a89bbfdef991523921f4733217009946eec4 --- libavcodec/xsubdec.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index 94a68e2..1bb90e2 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -93,8 +93,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, // allocate sub and set values sub->rects = av_mallocz(sizeof(*sub->rects)); + if (!sub->rects) + return AVERROR(ENOMEM); + sub->rects[0] = av_mallocz(sizeof(*sub->rects[0])); - sub->num_rects = 1; + if (!sub->rects[0]) { + av_freep(&sub->rects); + return AVERROR(ENOMEM); + } sub->rects[0]->x = x; sub->rects[0]->y = y; sub->rects[0]->w = w; sub->rects[0]->h = h; sub->rects[0]->type = SUBTITLE_BITMAP; @@ -102,6 +108,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, sub->rects[0]->pict.data[0] = av_malloc(w * h); sub->rects[0]->nb_colors = 4; sub->rects[0]->pict.data[1] = av_mallocz(AVPALETTE_SIZE); + if (!sub->rects[0]->pict.data[0] || !sub->rects[0]->pict.data[1]) { + av_freep(&sub->rects[0]); + av_freep(&sub->rects); + return AVERROR(ENOMEM); + + } + sub->num_rects = 1; // read palette for (i = 0; i < sub->rects[0]->nb_colors; i++) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
