ffmpeg | branch: release/2.2 | Christophe Gisquet <christophe.gisq...@gmail.com> | Mon Aug 18 14:15:22 2014 +0000| [e912b0777b24133df27836b6c529faa89af588dc] | committer: Luca Barbato
proresenc: Report buffer overflow If the allocated size, despite best efforts, is too small, exit with the appropriate error. CC: libav-sta...@libav.org Signed-off-by: Diego Biurrun <di...@biurrun.de> Signed-off-by: Luca Barbato <lu_z...@gentoo.org> (cherry picked from commit 58b68e4fdea22e22178e237bda950b09cc6f363a) Signed-off-by: Luca Barbato <lu_z...@gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e912b0777b24133df27836b6c529faa89af588dc --- libavcodec/proresenc.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libavcodec/proresenc.c b/libavcodec/proresenc.c index c03b3b5..90f7406 100644 --- a/libavcodec/proresenc.c +++ b/libavcodec/proresenc.c @@ -565,6 +565,11 @@ static int encode_slice(AVCodecContext *avctx, const AVFrame *pic, ctx->blocks[0], quant); } total_size += sizes[i]; + if (put_bits_left(pb) < 0) { + av_log(avctx, AV_LOG_ERROR, + "Underestimated required buffer size.\n"); + return AVERROR_BUG; + } } return total_size; } @@ -935,9 +940,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; avctx->coded_frame->key_frame = 1; - pkt_size = ctx->frame_size_upper_bound + FF_MIN_BUFFER_SIZE; + pkt_size = ctx->frame_size_upper_bound; - if ((ret = ff_alloc_packet(pkt, pkt_size)) < 0) { + if ((ret = ff_alloc_packet(pkt, pkt_size + FF_MIN_BUFFER_SIZE)) < 0) { av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n"); return ret; } @@ -1016,7 +1021,10 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, slice_hdr = buf; buf += slice_hdr_size - 1; init_put_bits(&pb, buf, (pkt_size - (buf - orig_buf)) * 8); - encode_slice(avctx, pic, &pb, sizes, x, y, q, mbs_per_slice); + ret = encode_slice(avctx, pic, &pb, sizes, x, y, q, + mbs_per_slice); + if (ret < 0) + return ret; bytestream_put_byte(&slice_hdr, q); slice_size = slice_hdr_size + sizes[ctx->num_planes - 1]; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
