[FFmpeg-cvslog] avcodec/dxtory: Fix input size check in dxtory_decode_v1_420()

2015-11-14 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Nov 15 00:25:11 2015 +0100| [9caa9414ccf2dcf8aee2695377dee830a5024c82] | 
committer: Michael Niedermayer

avcodec/dxtory: Fix input size check in dxtory_decode_v1_420()

Fixes out of array read
Fixes: 
c50c4aa6cefda71b19a31ea12302980c/asan_heap-oob_12be5fd_7011_33ebd015a74976215934add72b9c8352.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9caa9414ccf2dcf8aee2695377dee830a5024c82
---

 libavcodec/dxtory.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index 6f68c10..8a326b7 100644
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -108,7 +108,7 @@ static int dxtory_decode_v1_420(AVCodecContext *avctx, 
AVFrame *pic,
 uint8_t *Y1, *Y2, *U, *V;
 int ret;
 
-if (src_size < avctx->width * avctx->height * 3LL / 2) {
+if (src_size < FFALIGN(avctx->width, 2) * FFALIGN(avctx->height, 2) * 3LL 
/ 2) {
 av_log(avctx, AV_LOG_ERROR, "packet too small\n");
 return AVERROR_INVALIDDATA;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dxtory: Fix input size check in dxtory_decode_v1_420()

2015-11-18 Thread Michael Niedermayer 
ffmpeg | branch: release/2.7 | Michael Niedermayer  | 
Sun Nov 15 00:25:11 2015 +0100| [08940cd54596935e8780029d5c8ebcc0f409b58f] | 
committer: Michael Niedermayer

avcodec/dxtory: Fix input size check in dxtory_decode_v1_420()

Fixes out of array read
Fixes: 
c50c4aa6cefda71b19a31ea12302980c/asan_heap-oob_12be5fd_7011_33ebd015a74976215934add72b9c8352.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 9caa9414ccf2dcf8aee2695377dee830a5024c82)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08940cd54596935e8780029d5c8ebcc0f409b58f
---

 libavcodec/dxtory.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index 22e7b2f..c12a193 100644
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -108,7 +108,7 @@ static int dxtory_decode_v1_420(AVCodecContext *avctx, 
AVFrame *pic,
 uint8_t *Y1, *Y2, *U, *V;
 int ret;
 
-if (src_size < avctx->width * avctx->height * 3LL / 2) {
+if (src_size < FFALIGN(avctx->width, 2) * FFALIGN(avctx->height, 2) * 3LL 
/ 2) {
 av_log(avctx, AV_LOG_ERROR, "packet too small\n");
 return AVERROR_INVALIDDATA;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dxtory: Fix input size check in dxtory_decode_v1_420()

2015-11-19 Thread Michael Niedermayer 
ffmpeg | branch: release/2.6 | Michael Niedermayer  | 
Sun Nov 15 00:25:11 2015 +0100| [3f4a4f174a419ef51548c7dd48d46962460f4bc9] | 
committer: Michael Niedermayer

avcodec/dxtory: Fix input size check in dxtory_decode_v1_420()

Fixes out of array read
Fixes: 
c50c4aa6cefda71b19a31ea12302980c/asan_heap-oob_12be5fd_7011_33ebd015a74976215934add72b9c8352.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 9caa9414ccf2dcf8aee2695377dee830a5024c82)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f4a4f174a419ef51548c7dd48d46962460f4bc9
---

 libavcodec/dxtory.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index 22e7b2f..c12a193 100644
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -108,7 +108,7 @@ static int dxtory_decode_v1_420(AVCodecContext *avctx, 
AVFrame *pic,
 uint8_t *Y1, *Y2, *U, *V;
 int ret;
 
-if (src_size < avctx->width * avctx->height * 3LL / 2) {
+if (src_size < FFALIGN(avctx->width, 2) * FFALIGN(avctx->height, 2) * 3LL 
/ 2) {
 av_log(avctx, AV_LOG_ERROR, "packet too small\n");
 return AVERROR_INVALIDDATA;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dxtory: Fix input size check in dxtory_decode_v1_420()

2015-11-26 Thread Michael Niedermayer 
ffmpeg | branch: release/2.8 | Michael Niedermayer  | 
Sun Nov 15 00:25:11 2015 +0100| [c7a970a3a041ac9c22f84299ff8d4e897fc8c901] | 
committer: Michael Niedermayer

avcodec/dxtory: Fix input size check in dxtory_decode_v1_420()

Fixes out of array read
Fixes: 
c50c4aa6cefda71b19a31ea12302980c/asan_heap-oob_12be5fd_7011_33ebd015a74976215934add72b9c8352.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 9caa9414ccf2dcf8aee2695377dee830a5024c82)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7a970a3a041ac9c22f84299ff8d4e897fc8c901
---

 libavcodec/dxtory.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index 62bdd32..7df2213 100644
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -108,7 +108,7 @@ static int dxtory_decode_v1_420(AVCodecContext *avctx, 
AVFrame *pic,
 uint8_t *Y1, *Y2, *U, *V;
 int ret;
 
-if (src_size < avctx->width * avctx->height * 3LL / 2) {
+if (src_size < FFALIGN(avctx->width, 2) * FFALIGN(avctx->height, 2) * 3LL 
/ 2) {
 av_log(avctx, AV_LOG_ERROR, "packet too small\n");
 return AVERROR_INVALIDDATA;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dxtory: Fix input size check in dxtory_decode_v1_420()

2015-11-26 Thread Michael Niedermayer 
ffmpeg | branch: release/2.5 | Michael Niedermayer  | 
Sun Nov 15 00:25:11 2015 +0100| [f43b6a094c095a4f30735634e8411920307baa34] | 
committer: Michael Niedermayer

avcodec/dxtory: Fix input size check in dxtory_decode_v1_420()

Fixes out of array read
Fixes: 
c50c4aa6cefda71b19a31ea12302980c/asan_heap-oob_12be5fd_7011_33ebd015a74976215934add72b9c8352.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 9caa9414ccf2dcf8aee2695377dee830a5024c82)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f43b6a094c095a4f30735634e8411920307baa34
---

 libavcodec/dxtory.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index 91d87f0..bc3e838 100644
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -108,7 +108,7 @@ static int dxtory_decode_v1_420(AVCodecContext *avctx, 
AVFrame *pic,
 uint8_t *Y1, *Y2, *U, *V;
 int ret;
 
-if (src_size < avctx->width * avctx->height * 3LL / 2) {
+if (src_size < FFALIGN(avctx->width, 2) * FFALIGN(avctx->height, 2) * 3LL 
/ 2) {
 av_log(avctx, AV_LOG_ERROR, "packet too small\n");
 return AVERROR_INVALIDDATA;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dxtory: Fix input size check in dxtory_decode_v1_420()

2015-12-06 Thread Michael Niedermayer 
ffmpeg | branch: release/2.4 | Michael Niedermayer  | 
Sun Nov 15 00:25:11 2015 +0100| [0814b140b1d7d6d324cb76b863b9cbc8f62abd58] | 
committer: Michael Niedermayer

avcodec/dxtory: Fix input size check in dxtory_decode_v1_420()

Fixes out of array read
Fixes: 
c50c4aa6cefda71b19a31ea12302980c/asan_heap-oob_12be5fd_7011_33ebd015a74976215934add72b9c8352.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 9caa9414ccf2dcf8aee2695377dee830a5024c82)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0814b140b1d7d6d324cb76b863b9cbc8f62abd58
---

 libavcodec/dxtory.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index 5e32107..b89a45f 100644
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -108,7 +108,7 @@ static int dxtory_decode_v1_420(AVCodecContext *avctx, 
AVFrame *pic,
 uint8_t *Y1, *Y2, *U, *V;
 int ret;
 
-if (src_size < avctx->width * avctx->height * 3LL / 2) {
+if (src_size < FFALIGN(avctx->width, 2) * FFALIGN(avctx->height, 2) * 3LL 
/ 2) {
 av_log(avctx, AV_LOG_ERROR, "packet too small\n");
 return AVERROR_INVALIDDATA;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog