[FFmpeg-cvslog] avcodec/dxa: check dimensions

2015-03-12 Thread Michael Niedermayer 
ffmpeg | branch: release/0.10 | Michael Niedermayer michae...@gmx.at | Tue 
Oct 28 15:26:42 2014 +0100| [017226fdf9eb6e3985e87f6218d012f7b6fe99e3] | 
committer: Michael Niedermayer

avcodec/dxa: check dimensions

Fixes out of array access
Fixes: asan_heap-oob_11222fb_21_020.dxa
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit e70312dfc22c4e54d5716f28f28db8f99c74cc90)

Conflicts:

libavcodec/dxa.c

Signed-off-by: Michael Niedermayer michae...@gmx.at

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

 libavcodec/dxa.c |5 +
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index 20f5464..a5bf1a0 100644
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@@ -301,6 +301,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
 c-avctx = avctx;
 avctx-pix_fmt = PIX_FMT_PAL8;
 
+if (avctx-width%4 || avctx-height%4) {
+av_log(avctx, AV_LOG_ERROR, dimensions are not a multiple of 4);
+return AVERROR_INVALIDDATA;
+}
+
 avcodec_get_frame_defaults(c-pic);
 avcodec_get_frame_defaults(c-prev);
 

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

[FFmpeg-cvslog] avcodec/dxa: check dimensions

2014-12-20 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer michae...@gmx.at | Tue Oct 
28 15:26:42 2014 +0100| [251d66d746ca543f12f4b0c284021d5c6b9aeb38] | committer: 
Michael Niedermayer

avcodec/dxa: check dimensions

Fixes out of array access
Fixes: asan_heap-oob_11222fb_21_020.dxa
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit e70312dfc22c4e54d5716f28f28db8f99c74cc90)

Conflicts:

libavcodec/dxa.c

Signed-off-by: Michael Niedermayer michae...@gmx.at

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

 libavcodec/dxa.c |5 +
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index 3fda64c..e6caa7f 100644
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@@ -304,6 +304,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
 
 avctx-pix_fmt = AV_PIX_FMT_PAL8;
 
+if (avctx-width%4 || avctx-height%4) {
+av_log(avctx, AV_LOG_ERROR, dimensions are not a multiple of 4);
+return AVERROR_INVALIDDATA;
+}
+
 avcodec_get_frame_defaults(c-pic);
 avcodec_get_frame_defaults(c-prev);
 

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

[FFmpeg-cvslog] avcodec/dxa: check dimensions

2014-11-28 Thread Michael Niedermayer 
ffmpeg | branch: release/0.5 | Michael Niedermayer michae...@gmx.at | Tue Oct 
28 15:26:42 2014 +0100| [831416692b81586f6ef170e2fc021672528bd352] | committer: 
Michael Niedermayer

avcodec/dxa: check dimensions

Fixes out of array access
Fixes: asan_heap-oob_11222fb_21_020.dxa
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit e70312dfc22c4e54d5716f28f28db8f99c74cc90)

Conflicts:

libavcodec/dxa.c

Signed-off-by: Michael Niedermayer michae...@gmx.at

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

 libavcodec/dxa.c |5 +
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index e415da7..6d75498 100644
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@@ -290,6 +290,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
 {
 DxaDecContext * const c = avctx-priv_data;
 
+if (avctx-width%4 || avctx-height%4) {
+av_log(avctx, AV_LOG_ERROR, dimensions are not a multiple of 4);
+return AVERROR_INVALIDDATA;
+}
+
 c-avctx = avctx;
 avctx-pix_fmt = PIX_FMT_PAL8;
 

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

[FFmpeg-cvslog] avcodec/dxa: check dimensions

2014-11-14 Thread Michael Niedermayer 
ffmpeg | branch: release/2.0 | Michael Niedermayer michae...@gmx.at | Tue Oct 
28 15:26:42 2014 +0100| [808b0ccc03dcdac68eb8b693b5c9a59aa1d62b6d] | committer: 
Michael Niedermayer

avcodec/dxa: check dimensions

Fixes out of array access
Fixes: asan_heap-oob_11222fb_21_020.dxa
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit e70312dfc22c4e54d5716f28f28db8f99c74cc90)

Conflicts:

libavcodec/dxa.c

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

 libavcodec/dxa.c |5 +
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index 985b9da..c56c0af2 100644
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@@ -306,6 +306,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
 
 avctx-pix_fmt = AV_PIX_FMT_PAL8;
 
+if (avctx-width%4 || avctx-height%4) {
+avpriv_request_sample(avctx, dimensions are not a multiple of 4);
+return AVERROR_INVALIDDATA;
+}
+
 c-prev = av_frame_alloc();
 if (!c-prev)
 return AVERROR(ENOMEM);

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

[FFmpeg-cvslog] avcodec/dxa: check dimensions

2014-11-02 Thread Michael Niedermayer 
ffmpeg | branch: release/1.2 | Michael Niedermayer michae...@gmx.at | Tue Oct 
28 15:26:42 2014 +0100| [d59804bafbaf8ce4bb194f04a4692271a8f8f875] | committer: 
Michael Niedermayer

avcodec/dxa: check dimensions

Fixes out of array access
Fixes: asan_heap-oob_11222fb_21_020.dxa
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit e70312dfc22c4e54d5716f28f28db8f99c74cc90)

Conflicts:

libavcodec/dxa.c

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

 libavcodec/dxa.c |5 +
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index 7bd74f3..52a0fef 100644
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@@ -308,6 +308,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
 
 avctx-pix_fmt = AV_PIX_FMT_PAL8;
 
+if (avctx-width%4 || avctx-height%4) {
+av_log(avctx, AV_LOG_ERROR, dimensions are not a multiple of 4);
+return AVERROR_INVALIDDATA;
+}
+
 avcodec_get_frame_defaults(c-pic);
 avcodec_get_frame_defaults(c-prev);
 

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

[FFmpeg-cvslog] avcodec/dxa: check dimensions

2014-11-01 Thread Michael Niedermayer 
ffmpeg | branch: release/2.3 | Michael Niedermayer michae...@gmx.at | Tue Oct 
28 15:26:42 2014 +0100| [7b7d12ea0448c8418ab086ec8f202a5fb14f54fe] | committer: 
Michael Niedermayer

avcodec/dxa: check dimensions

Fixes out of array access
Fixes: asan_heap-oob_11222fb_21_020.dxa
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit e70312dfc22c4e54d5716f28f28db8f99c74cc90)

Signed-off-by: Michael Niedermayer michae...@gmx.at

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

 libavcodec/dxa.c |5 +
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index 0f64b5e..c8e3f71 100644
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@@ -329,6 +329,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
 {
 DxaDecContext * const c = avctx-priv_data;
 
+if (avctx-width%4 || avctx-height%4) {
+avpriv_request_sample(avctx, dimensions are not a multiple of 4);
+return AVERROR_INVALIDDATA;
+}
+
 c-prev = av_frame_alloc();
 if (!c-prev)
 return AVERROR(ENOMEM);

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

[FFmpeg-cvslog] avcodec/dxa: check dimensions

2014-10-28 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Oct 28 
15:26:42 2014 +0100| [e70312dfc22c4e54d5716f28f28db8f99c74cc90] | committer: 
Michael Niedermayer

avcodec/dxa: check dimensions

Fixes out of array access
Fixes: asan_heap-oob_11222fb_21_020.dxa
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer michae...@gmx.at

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

 libavcodec/dxa.c |5 +
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index 0f64b5e..c8e3f71 100644
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@@ -329,6 +329,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
 {
 DxaDecContext * const c = avctx-priv_data;
 
+if (avctx-width%4 || avctx-height%4) {
+avpriv_request_sample(avctx, dimensions are not a multiple of 4);
+return AVERROR_INVALIDDATA;
+}
+
 c-prev = av_frame_alloc();
 if (!c-prev)
 return AVERROR(ENOMEM);

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