[FFmpeg-cvslog] avcodec/utils: Better check for channels in av_get_audio_frame_duration()

2015-12-06 Thread Michael Niedermayer 
ffmpeg | branch: release/2.4 | Michael Niedermayer  | 
Sat Nov 14 01:35:08 2015 +0100| [00dc345a83b882e3e86b76d37c11d8ad1257609b] | 
committer: Michael Niedermayer

avcodec/utils: Better check for channels in av_get_audio_frame_duration()

Fixes integer overflow
Fixes: 
0c2625f236ced104d402b4a03c0d65c7/asan_generic_274e1ce_5990_9314e7a67c26aecf011b178ade9f217c.avi

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

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 0901e75..d249507 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -3263,7 +3263,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, 
int frame_bytes)
 return frame_bytes * 8 / bps;
 }
 
-if (ch > 0) {
+if (ch > 0 && ch < INT_MAX/16) {
 /* calc from frame_bytes and channels */
 switch (id) {
 case AV_CODEC_ID_ADPCM_AFC:

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

[FFmpeg-cvslog] avcodec/utils: Better check for channels in av_get_audio_frame_duration()

2015-11-26 Thread Michael Niedermayer 
ffmpeg | branch: release/2.8 | Michael Niedermayer  | 
Sat Nov 14 01:35:08 2015 +0100| [c0748b9954c8cc8fd2aec10f722000c9ec1f349c] | 
committer: Michael Niedermayer

avcodec/utils: Better check for channels in av_get_audio_frame_duration()

Fixes integer overflow
Fixes: 
0c2625f236ced104d402b4a03c0d65c7/asan_generic_274e1ce_5990_9314e7a67c26aecf011b178ade9f217c.avi

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

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index f51070c..735e71a 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -3490,7 +3490,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, 
int frame_bytes)
 return frame_bytes * 8 / bps;
 }
 
-if (ch > 0) {
+if (ch > 0 && ch < INT_MAX/16) {
 /* calc from frame_bytes and channels */
 switch (id) {
 case AV_CODEC_ID_ADPCM_AFC:

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

[FFmpeg-cvslog] avcodec/utils: Better check for channels in av_get_audio_frame_duration()

2015-11-26 Thread Michael Niedermayer 
ffmpeg | branch: release/2.5 | Michael Niedermayer  | 
Sat Nov 14 01:35:08 2015 +0100| [72ac69bd05ef65221473766b62756749fb4f4456] | 
committer: Michael Niedermayer

avcodec/utils: Better check for channels in av_get_audio_frame_duration()

Fixes integer overflow
Fixes: 
0c2625f236ced104d402b4a03c0d65c7/asan_generic_274e1ce_5990_9314e7a67c26aecf011b178ade9f217c.avi

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

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 0cc1f90..ad61ac3 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -3371,7 +3371,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, 
int frame_bytes)
 return frame_bytes * 8 / bps;
 }
 
-if (ch > 0) {
+if (ch > 0 && ch < INT_MAX/16) {
 /* calc from frame_bytes and channels */
 switch (id) {
 case AV_CODEC_ID_ADPCM_AFC:

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

[FFmpeg-cvslog] avcodec/utils: Better check for channels in av_get_audio_frame_duration()

2015-11-19 Thread Michael Niedermayer 
ffmpeg | branch: release/2.6 | Michael Niedermayer  | 
Sat Nov 14 01:35:08 2015 +0100| [896c8e38915cc452556c50c7c2f58d72b898f2fc] | 
committer: Michael Niedermayer

avcodec/utils: Better check for channels in av_get_audio_frame_duration()

Fixes integer overflow
Fixes: 
0c2625f236ced104d402b4a03c0d65c7/asan_generic_274e1ce_5990_9314e7a67c26aecf011b178ade9f217c.avi

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

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 3c75df7..f7d049b 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -3395,7 +3395,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, 
int frame_bytes)
 return frame_bytes * 8 / bps;
 }
 
-if (ch > 0) {
+if (ch > 0 && ch < INT_MAX/16) {
 /* calc from frame_bytes and channels */
 switch (id) {
 case AV_CODEC_ID_ADPCM_AFC:

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

[FFmpeg-cvslog] avcodec/utils: Better check for channels in av_get_audio_frame_duration()

2015-11-18 Thread Michael Niedermayer 
ffmpeg | branch: release/2.7 | Michael Niedermayer  | 
Sat Nov 14 01:35:08 2015 +0100| [63465f00707c0dc6b1f0c30c950f5782dc9f059a] | 
committer: Michael Niedermayer

avcodec/utils: Better check for channels in av_get_audio_frame_duration()

Fixes integer overflow
Fixes: 
0c2625f236ced104d402b4a03c0d65c7/asan_generic_274e1ce_5990_9314e7a67c26aecf011b178ade9f217c.avi

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

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 6596aea..cc689d8 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -3418,7 +3418,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, 
int frame_bytes)
 return frame_bytes * 8 / bps;
 }
 
-if (ch > 0) {
+if (ch > 0 && ch < INT_MAX/16) {
 /* calc from frame_bytes and channels */
 switch (id) {
 case AV_CODEC_ID_ADPCM_AFC:

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

[FFmpeg-cvslog] avcodec/utils: Better check for channels in av_get_audio_frame_duration()

2015-11-13 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat 
Nov 14 01:35:08 2015 +0100| [4e16ad2868a1819de6680fc355a8eb20164adaea] | 
committer: Michael Niedermayer

avcodec/utils: Better check for channels in av_get_audio_frame_duration()

Fixes integer overflow
Fixes: 
0c2625f236ced104d402b4a03c0d65c7/asan_generic_274e1ce_5990_9314e7a67c26aecf011b178ade9f217c.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=4e16ad2868a1819de6680fc355a8eb20164adaea
---

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index d473b49..e279147 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -3067,7 +3067,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, 
int frame_bytes)
 return frame_bytes * 8 / bps;
 }
 
-if (ch > 0) {
+if (ch > 0 && ch < INT_MAX/16) {
 /* calc from frame_bytes and channels */
 switch (id) {
 case AV_CODEC_ID_ADPCM_AFC:

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