[FFmpeg-cvslog] avformat/kvag: Check sample_rate

2024-06-14 Thread Michael Niedermayer 
ffmpeg | branch: release/4.3 | Michael Niedermayer  | 
Mon Apr 29 23:44:25 2024 +0200| [98a7a5000f9ee2d48dfa960017bc6c2b7d60ba99] | 
committer: Michael Niedermayer

avformat/kvag: Check sample_rate

Fixes: Division by 0
Fixes: -copyts -start_at_zero -itsoffset 00:00:01 -itsscale 1 -ss 00:00:02  -i 
zgclab/ffmpeg_crash/poc1 output.mp4

Found-by: Wang Dawei and Zhou Geng, from Zhongguancun Laboratory
Signed-off-by: Michael Niedermayer 
(cherry picked from commit c26a762ea1bf028a33554a5f7a18d8dd7d82f5a8)
Signed-off-by: Michael Niedermayer 

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

 libavformat/kvag.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/kvag.c b/libavformat/kvag.c
index 8f641873b9..2c65c3e376 100644
--- a/libavformat/kvag.c
+++ b/libavformat/kvag.c
@@ -31,7 +31,7 @@
 typedef struct KVAGHeader {
 uint32_tmagic;
 uint32_tdata_size;
-uint32_tsample_rate;
+intsample_rate;
 uint16_tstereo;
 } KVAGHeader;
 
@@ -65,6 +65,9 @@ static int kvag_read_header(AVFormatContext *s)
 hdr.sample_rate = AV_RL32(buf +  8);
 hdr.stereo  = AV_RL16(buf + 12);
 
+if (hdr.sample_rate <= 0)
+return AVERROR_INVALIDDATA;
+
 par = st->codecpar;
 par->codec_type = AVMEDIA_TYPE_AUDIO;
 par->codec_id   = AV_CODEC_ID_ADPCM_IMA_SSI;

___
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/kvag: Check sample_rate

2024-06-13 Thread Michael Niedermayer 
ffmpeg | branch: release/5.1 | Michael Niedermayer  | 
Mon Apr 29 23:44:25 2024 +0200| [a2e4f3e5f4b425cfe71b373d2805646d73b6637a] | 
committer: Michael Niedermayer

avformat/kvag: Check sample_rate

Fixes: Division by 0
Fixes: -copyts -start_at_zero -itsoffset 00:00:01 -itsscale 1 -ss 00:00:02  -i 
zgclab/ffmpeg_crash/poc1 output.mp4

Found-by: Wang Dawei and Zhou Geng, from Zhongguancun Laboratory
Signed-off-by: Michael Niedermayer 
(cherry picked from commit c26a762ea1bf028a33554a5f7a18d8dd7d82f5a8)
Signed-off-by: Michael Niedermayer 

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

 libavformat/kvag.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/kvag.c b/libavformat/kvag.c
index 7c3816ab82..cae2b12287 100644
--- a/libavformat/kvag.c
+++ b/libavformat/kvag.c
@@ -36,7 +36,7 @@
 typedef struct KVAGHeader {
 uint32_tmagic;
 uint32_tdata_size;
-uint32_tsample_rate;
+intsample_rate;
 uint16_tstereo;
 } KVAGHeader;
 
@@ -68,6 +68,9 @@ static int kvag_read_header(AVFormatContext *s)
 hdr.sample_rate = AV_RL32(buf +  8);
 hdr.stereo  = AV_RL16(buf + 12);
 
+if (hdr.sample_rate <= 0)
+return AVERROR_INVALIDDATA;
+
 par = st->codecpar;
 par->codec_type = AVMEDIA_TYPE_AUDIO;
 par->codec_id   = AV_CODEC_ID_ADPCM_IMA_SSI;

___
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/kvag: Check sample_rate

2024-05-24 Thread Michael Niedermayer 
ffmpeg | branch: release/6.1 | Michael Niedermayer  | 
Mon Apr 29 23:44:25 2024 +0200| [115853a821b62774980f9e3e273ad257afe7232c] | 
committer: Michael Niedermayer

avformat/kvag: Check sample_rate

Fixes: Division by 0
Fixes: -copyts -start_at_zero -itsoffset 00:00:01 -itsscale 1 -ss 00:00:02  -i 
zgclab/ffmpeg_crash/poc1 output.mp4

Found-by: Wang Dawei and Zhou Geng, from Zhongguancun Laboratory
Signed-off-by: Michael Niedermayer 
(cherry picked from commit c26a762ea1bf028a33554a5f7a18d8dd7d82f5a8)
Signed-off-by: Michael Niedermayer 

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

 libavformat/kvag.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/kvag.c b/libavformat/kvag.c
index 9487e7dd0e..3654a9e8e4 100644
--- a/libavformat/kvag.c
+++ b/libavformat/kvag.c
@@ -37,7 +37,7 @@
 typedef struct KVAGHeader {
 uint32_tmagic;
 uint32_tdata_size;
-uint32_tsample_rate;
+intsample_rate;
 uint16_tstereo;
 } KVAGHeader;
 
@@ -69,6 +69,9 @@ static int kvag_read_header(AVFormatContext *s)
 hdr.sample_rate = AV_RL32(buf +  8);
 hdr.stereo  = AV_RL16(buf + 12);
 
+if (hdr.sample_rate <= 0)
+return AVERROR_INVALIDDATA;
+
 par = st->codecpar;
 par->codec_type = AVMEDIA_TYPE_AUDIO;
 par->codec_id   = AV_CODEC_ID_ADPCM_IMA_SSI;

___
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/kvag: Check sample_rate

2024-05-22 Thread Michael Niedermayer 
ffmpeg | branch: release/7.0 | Michael Niedermayer  | 
Mon Apr 29 23:44:25 2024 +0200| [dba4b859d86b54fbf4201ca5c86a45d5b0764842] | 
committer: Michael Niedermayer

avformat/kvag: Check sample_rate

Fixes: Division by 0
Fixes: -copyts -start_at_zero -itsoffset 00:00:01 -itsscale 1 -ss 00:00:02  -i 
zgclab/ffmpeg_crash/poc1 output.mp4

Found-by: Wang Dawei and Zhou Geng, from Zhongguancun Laboratory
Signed-off-by: Michael Niedermayer 
(cherry picked from commit c26a762ea1bf028a33554a5f7a18d8dd7d82f5a8)
Signed-off-by: Michael Niedermayer 

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

 libavformat/kvag.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/kvag.c b/libavformat/kvag.c
index 1d0aee0994..b55aa893ec 100644
--- a/libavformat/kvag.c
+++ b/libavformat/kvag.c
@@ -38,7 +38,7 @@
 typedef struct KVAGHeader {
 uint32_tmagic;
 uint32_tdata_size;
-uint32_tsample_rate;
+intsample_rate;
 uint16_tstereo;
 } KVAGHeader;
 
@@ -70,6 +70,9 @@ static int kvag_read_header(AVFormatContext *s)
 hdr.sample_rate = AV_RL32(buf +  8);
 hdr.stereo  = AV_RL16(buf + 12);
 
+if (hdr.sample_rate <= 0)
+return AVERROR_INVALIDDATA;
+
 par = st->codecpar;
 par->codec_type = AVMEDIA_TYPE_AUDIO;
 par->codec_id   = AV_CODEC_ID_ADPCM_IMA_SSI;

___
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/kvag: Check sample_rate

2024-04-30 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Apr 29 23:44:25 2024 +0200| [c26a762ea1bf028a33554a5f7a18d8dd7d82f5a8] | 
committer: Michael Niedermayer

avformat/kvag: Check sample_rate

Fixes: Division by 0
Fixes: -copyts -start_at_zero -itsoffset 00:00:01 -itsscale 1 -ss 00:00:02  -i 
zgclab/ffmpeg_crash/poc1 output.mp4

Found-by: Wang Dawei and Zhou Geng, from Zhongguancun Laboratory
Signed-off-by: Michael Niedermayer 

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

 libavformat/kvag.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/kvag.c b/libavformat/kvag.c
index 1d0aee0994..b55aa893ec 100644
--- a/libavformat/kvag.c
+++ b/libavformat/kvag.c
@@ -38,7 +38,7 @@
 typedef struct KVAGHeader {
 uint32_tmagic;
 uint32_tdata_size;
-uint32_tsample_rate;
+intsample_rate;
 uint16_tstereo;
 } KVAGHeader;
 
@@ -70,6 +70,9 @@ static int kvag_read_header(AVFormatContext *s)
 hdr.sample_rate = AV_RL32(buf +  8);
 hdr.stereo  = AV_RL16(buf + 12);
 
+if (hdr.sample_rate <= 0)
+return AVERROR_INVALIDDATA;
+
 par = st->codecpar;
 par->codec_type = AVMEDIA_TYPE_AUDIO;
 par->codec_id   = AV_CODEC_ID_ADPCM_IMA_SSI;

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