Module: libav Branch: release/9 Commit: b7765d00f911fe0f8fcda21b93a540f27d2ba2f5
Author: Anton Khirnov <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Tue Jan 29 12:24:09 2013 +0100 msrledec: check bounds before constructing a possibly invalid pointer, CC:[email protected] (cherry picked from commit 9bd6375d5f16842306dcecde637ffe605acda26b) Signed-off-by: Reinhard Tartler <[email protected]> --- libavcodec/msrledec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/msrledec.c b/libavcodec/msrledec.c index fad9415..af2a247 100644 --- a/libavcodec/msrledec.c +++ b/libavcodec/msrledec.c @@ -144,8 +144,7 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, if(p1 == 0) { //Escape code p2 = bytestream2_get_byte(gb); if(p2 == 0) { //End-of-line - output = pic->data[0] + (--line) * pic->linesize[0]; - if (line < 0) { + if (--line < 0) { if (bytestream2_get_be16(gb) == 1) { // end-of-picture return 0; } else { @@ -155,6 +154,7 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, return AVERROR_INVALIDDATA; } } + output = pic->data[0] + line * pic->linesize[0]; pos = 0; continue; } else if(p2 == 1) { //End-of-picture _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
