[FFmpeg-cvslog] avcodec/utils: Ensure 8x8 alignment for ARGO in avcodec_align_dimensions2()

2021-10-21 Thread Michael Niedermayer 
ffmpeg | branch: release/4.4 | Michael Niedermayer  | 
Sun Oct 10 23:13:43 2021 +0200| [32b68a62328a98e8ea5fb8b8a4c09704ff565334] | 
committer: Michael Niedermayer

avcodec/utils: Ensure 8x8 alignment for ARGO in avcodec_align_dimensions2()

Fixes: out of array access
Fixes: 
39736/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARGO_fuzzer-4820016722214912

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 17e36fac0b5432f67e25adca7186c57f2dbe1c71)
Signed-off-by: Michael Niedermayer 

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

 libavcodec/utils.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 08c37a1d93..825094d2f3 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -268,6 +268,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int 
*width, int *height,
 h_align = 4;
 }
 if (s->codec_id == AV_CODEC_ID_JV ||
+s->codec_id == AV_CODEC_ID_ARGO ||
 s->codec_id == AV_CODEC_ID_INTERPLAY_VIDEO) {
 w_align = 8;
 h_align = 8;
@@ -298,8 +299,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int 
*width, int *height,
 break;
 case AV_PIX_FMT_BGR0:
 if (s->codec_id == AV_CODEC_ID_ARGO) {
-w_align = 4;
-h_align = 4;
+w_align = 8;
+h_align = 8;
 }
 break;
 default:

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

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/utils: Ensure 8x8 alignment for ARGO in avcodec_align_dimensions2()

2021-10-11 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Oct 10 23:13:43 2021 +0200| [17e36fac0b5432f67e25adca7186c57f2dbe1c71] | 
committer: Michael Niedermayer

avcodec/utils: Ensure 8x8 alignment for ARGO in avcodec_align_dimensions2()

Fixes: out of array access
Fixes: 
39736/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARGO_fuzzer-4820016722214912

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

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

 libavcodec/utils.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index b4076d94f2..a91a54b0dc 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -270,6 +270,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int 
*width, int *height,
 h_align = 4;
 }
 if (s->codec_id == AV_CODEC_ID_JV ||
+s->codec_id == AV_CODEC_ID_ARGO ||
 s->codec_id == AV_CODEC_ID_INTERPLAY_VIDEO) {
 w_align = 8;
 h_align = 8;
@@ -300,8 +301,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int 
*width, int *height,
 break;
 case AV_PIX_FMT_BGR0:
 if (s->codec_id == AV_CODEC_ID_ARGO) {
-w_align = 4;
-h_align = 4;
+w_align = 8;
+h_align = 8;
 }
 break;
 default:

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

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".