[FFmpeg-cvslog] avformat/dxa: Adjust order of operations around block align

2024-04-14 Thread Michael Niedermayer 
ffmpeg | branch: release/3.4 | Michael Niedermayer  | 
Sat Sep 30 00:51:29 2023 +0200| [fd02b195bf9f5f1cd28cd41108d8c3c3cd20b3cc] | 
committer: Michael Niedermayer

avformat/dxa: Adjust order of operations around block align

Fixes: 
51896/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-5730576523198464
Fixes: signed integer overflow: 2147483566 + 82 cannot be represented in type 
'int'

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

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

 libavformat/dxa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/dxa.c b/libavformat/dxa.c
index 0d820c7413..c94665676a 100644
--- a/libavformat/dxa.c
+++ b/libavformat/dxa.c
@@ -122,7 +122,7 @@ static int dxa_read_header(AVFormatContext *s)
 if(ast->codecpar->block_align) {
 if (c->bpc > INT_MAX - ast->codecpar->block_align + 1)
 return AVERROR_INVALIDDATA;
-c->bpc = ((c->bpc + ast->codecpar->block_align - 1) / 
ast->codecpar->block_align) * ast->codecpar->block_align;
+c->bpc = ((c->bpc - 1 + ast->codecpar->block_align) / 
ast->codecpar->block_align) * ast->codecpar->block_align;
 }
 c->bytes_left = fsize;
 c->wavpos = avio_tell(pb);

___
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] avformat/dxa: Adjust order of operations around block align

2024-04-14 Thread Michael Niedermayer 
ffmpeg | branch: release/4.2 | Michael Niedermayer  | 
Sat Sep 30 00:51:29 2023 +0200| [6a9879944fb34a183b9c5c5fae46a039e872c29d] | 
committer: Michael Niedermayer

avformat/dxa: Adjust order of operations around block align

Fixes: 
51896/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-5730576523198464
Fixes: signed integer overflow: 2147483566 + 82 cannot be represented in type 
'int'

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

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

 libavformat/dxa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/dxa.c b/libavformat/dxa.c
index 03b9dbc43b..62d6bcbdc0 100644
--- a/libavformat/dxa.c
+++ b/libavformat/dxa.c
@@ -122,7 +122,7 @@ static int dxa_read_header(AVFormatContext *s)
 if(ast->codecpar->block_align) {
 if (c->bpc > INT_MAX - ast->codecpar->block_align + 1)
 return AVERROR_INVALIDDATA;
-c->bpc = ((c->bpc + ast->codecpar->block_align - 1) / 
ast->codecpar->block_align) * ast->codecpar->block_align;
+c->bpc = ((c->bpc - 1 + ast->codecpar->block_align) / 
ast->codecpar->block_align) * ast->codecpar->block_align;
 }
 c->bytes_left = fsize;
 c->wavpos = avio_tell(pb);

___
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] avformat/dxa: Adjust order of operations around block align

2024-04-14 Thread Michael Niedermayer 
ffmpeg | branch: release/4.4 | Michael Niedermayer  | 
Sat Sep 30 00:51:29 2023 +0200| [f966c25d25f4550278a85bbd58e7d1e519d62e59] | 
committer: Michael Niedermayer

avformat/dxa: Adjust order of operations around block align

Fixes: 
51896/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-5730576523198464
Fixes: signed integer overflow: 2147483566 + 82 cannot be represented in type 
'int'

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

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

 libavformat/dxa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/dxa.c b/libavformat/dxa.c
index 2a5487710f..e815f8a540 100644
--- a/libavformat/dxa.c
+++ b/libavformat/dxa.c
@@ -122,7 +122,7 @@ static int dxa_read_header(AVFormatContext *s)
 if(ast->codecpar->block_align) {
 if (c->bpc > INT_MAX - ast->codecpar->block_align + 1)
 return AVERROR_INVALIDDATA;
-c->bpc = ((c->bpc + ast->codecpar->block_align - 1) / 
ast->codecpar->block_align) * ast->codecpar->block_align;
+c->bpc = ((c->bpc - 1 + ast->codecpar->block_align) / 
ast->codecpar->block_align) * ast->codecpar->block_align;
 }
 c->bytes_left = fsize;
 c->wavpos = avio_tell(pb);

___
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] avformat/dxa: Adjust order of operations around block align

2024-04-14 Thread Michael Niedermayer 
ffmpeg | branch: release/5.1 | Michael Niedermayer  | 
Sat Sep 30 00:51:29 2023 +0200| [1f6fcc64179377114b4ecc3b9f63bd5774a64edf] | 
committer: Michael Niedermayer

avformat/dxa: Adjust order of operations around block align

Fixes: 
51896/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-5730576523198464
Fixes: signed integer overflow: 2147483566 + 82 cannot be represented in type 
'int'

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

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

 libavformat/dxa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/dxa.c b/libavformat/dxa.c
index 474b85270a..b4d9d00529 100644
--- a/libavformat/dxa.c
+++ b/libavformat/dxa.c
@@ -122,7 +122,7 @@ static int dxa_read_header(AVFormatContext *s)
 if(ast->codecpar->block_align) {
 if (c->bpc > INT_MAX - ast->codecpar->block_align + 1)
 return AVERROR_INVALIDDATA;
-c->bpc = ((c->bpc + ast->codecpar->block_align - 1) / 
ast->codecpar->block_align) * ast->codecpar->block_align;
+c->bpc = ((c->bpc - 1 + ast->codecpar->block_align) / 
ast->codecpar->block_align) * ast->codecpar->block_align;
 }
 c->bytes_left = fsize;
 c->wavpos = avio_tell(pb);

___
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] avformat/dxa: Adjust order of operations around block align

2024-04-14 Thread Michael Niedermayer 
ffmpeg | branch: release/6.0 | Michael Niedermayer  | 
Sat Sep 30 00:51:29 2023 +0200| [22b7b6793160b7029f50d15202c0d254c84ba73f] | 
committer: Michael Niedermayer

avformat/dxa: Adjust order of operations around block align

Fixes: 
51896/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-5730576523198464
Fixes: signed integer overflow: 2147483566 + 82 cannot be represented in type 
'int'

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

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

 libavformat/dxa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/dxa.c b/libavformat/dxa.c
index 474b85270a..b4d9d00529 100644
--- a/libavformat/dxa.c
+++ b/libavformat/dxa.c
@@ -122,7 +122,7 @@ static int dxa_read_header(AVFormatContext *s)
 if(ast->codecpar->block_align) {
 if (c->bpc > INT_MAX - ast->codecpar->block_align + 1)
 return AVERROR_INVALIDDATA;
-c->bpc = ((c->bpc + ast->codecpar->block_align - 1) / 
ast->codecpar->block_align) * ast->codecpar->block_align;
+c->bpc = ((c->bpc - 1 + ast->codecpar->block_align) / 
ast->codecpar->block_align) * ast->codecpar->block_align;
 }
 c->bytes_left = fsize;
 c->wavpos = avio_tell(pb);

___
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] avformat/dxa: Adjust order of operations around block align

2024-04-13 Thread Michael Niedermayer 
ffmpeg | branch: release/6.1 | Michael Niedermayer  | 
Sat Sep 30 00:51:29 2023 +0200| [521347ee0bffd3603d3251b391e487cb3d7625d8] | 
committer: Michael Niedermayer

avformat/dxa: Adjust order of operations around block align

Fixes: 
51896/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-5730576523198464
Fixes: signed integer overflow: 2147483566 + 82 cannot be represented in type 
'int'

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

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

 libavformat/dxa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/dxa.c b/libavformat/dxa.c
index 474b85270a..b4d9d00529 100644
--- a/libavformat/dxa.c
+++ b/libavformat/dxa.c
@@ -122,7 +122,7 @@ static int dxa_read_header(AVFormatContext *s)
 if(ast->codecpar->block_align) {
 if (c->bpc > INT_MAX - ast->codecpar->block_align + 1)
 return AVERROR_INVALIDDATA;
-c->bpc = ((c->bpc + ast->codecpar->block_align - 1) / 
ast->codecpar->block_align) * ast->codecpar->block_align;
+c->bpc = ((c->bpc - 1 + ast->codecpar->block_align) / 
ast->codecpar->block_align) * ast->codecpar->block_align;
 }
 c->bytes_left = fsize;
 c->wavpos = avio_tell(pb);

___
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] avformat/dxa: Adjust order of operations around block align

2024-03-25 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat 
Sep 30 00:51:29 2023 +0200| [50d8e4f27398fd5778485a827d7a2817921f8540] | 
committer: Michael Niedermayer

avformat/dxa: Adjust order of operations around block align

Fixes: 
51896/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-5730576523198464
Fixes: signed integer overflow: 2147483566 + 82 cannot be represented in type 
'int'

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=50d8e4f27398fd5778485a827d7a2817921f8540
---

 libavformat/dxa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/dxa.c b/libavformat/dxa.c
index 58757e8358..813e665a27 100644
--- a/libavformat/dxa.c
+++ b/libavformat/dxa.c
@@ -123,7 +123,7 @@ static int dxa_read_header(AVFormatContext *s)
 if(ast->codecpar->block_align) {
 if (c->bpc > INT_MAX - ast->codecpar->block_align + 1)
 return AVERROR_INVALIDDATA;
-c->bpc = ((c->bpc + ast->codecpar->block_align - 1) / 
ast->codecpar->block_align) * ast->codecpar->block_align;
+c->bpc = ((c->bpc - 1 + ast->codecpar->block_align) / 
ast->codecpar->block_align) * ast->codecpar->block_align;
 }
 c->bytes_left = fsize;
 c->wavpos = avio_tell(pb);

___
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".