ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Feb 22 17:52:59 2015 +0100| [9b8152bf047bbebe4495b993258591687bcdd36d] | committer: Michael Niedermayer
avformat/oggdec: Check for av_malloc() failure and forward the error code Fixes CID1257805 Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b8152bf047bbebe4495b993258591687bcdd36d --- libavformat/oggdec.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 3f152a4..f19c5b1 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -276,6 +276,9 @@ static int ogg_new_buf(struct ogg *ogg, int idx) uint8_t *nb = av_malloc(os->bufsize + FF_INPUT_BUFFER_PADDING_SIZE); int size = os->bufpos - os->pstart; + if (!nb) + return AVERROR(ENOMEM); + if (os->buf) { memcpy(nb, os->buf + os->pstart, size); av_free(os->buf); @@ -370,8 +373,11 @@ static int ogg_read_page(AVFormatContext *s, int *sid) ogg->page_pos = os->page_pos = avio_tell(bc) - 27; - if (os->psize > 0) - ogg_new_buf(ogg, idx); + if (os->psize > 0) { + ret = ogg_new_buf(ogg, idx); + if (ret < 0) + return ret; + } ret = avio_read(bc, os->segments, nsegs); if (ret < nsegs) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
