[FFmpeg-cvslog] avformat/avidec: Check nb_streams in read_gab2_sub()

[Michael Niedermayer]

ffmpeg | branch: release/2.8 | Michael Niedermayer  | 
Wed Sep 28 16:14:08 2016 +0200| [239f75d6c3dfbe4def80a12913d5737dd5a5bbcc] | 
committer: Michael Niedermayer

avformat/avidec: Check nb_streams in read_gab2_sub()

Fixes null pointer dereference
Fixes: 1/null_point.avi

Found-by: 连一汉 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 2679ad4773aa356e7c3da5c68bc81f02a194617f)
Signed-off-by: Michael Niedermayer 

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

 libavformat/avidec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 0ffe990..d2904ab 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1090,6 +1090,8 @@ static int read_gab2_sub(AVFormatContext *s, AVStream 
*st, AVPacket *pkt)
 goto error;
 
 if (!avformat_open_input(>sub_ctx, "", sub_demuxer, NULL)) {
+if (ast->sub_ctx->nb_streams != 1)
+goto error;
 ff_read_packet(ast->sub_ctx, >sub_pkt);
 *st->codec = *ast->sub_ctx->streams[0]->codec;
 ast->sub_ctx->streams[0]->codec->extradata = NULL;

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

[FFmpeg-cvslog] avformat/avidec: Check nb_streams in read_gab2_sub()

[Michael Niedermayer]

ffmpeg | branch: release/3.1 | Michael Niedermayer  | 
Wed Sep 28 16:14:08 2016 +0200| [622ccbd8ab894e3ac6cdf607e3d4f39e406786e9] | 
committer: Michael Niedermayer

avformat/avidec: Check nb_streams in read_gab2_sub()

Fixes null pointer dereference
Fixes: 1/null_point.avi

Found-by: 连一汉 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 2679ad4773aa356e7c3da5c68bc81f02a194617f)
Signed-off-by: Michael Niedermayer 

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

 libavformat/avidec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 410c2d5..3c5f3ec 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1097,6 +1097,8 @@ static int read_gab2_sub(AVFormatContext *s, AVStream 
*st, AVPacket *pkt)
 goto error;
 
 if (!avformat_open_input(>sub_ctx, "", sub_demuxer, NULL)) {
+if (ast->sub_ctx->nb_streams != 1)
+goto error;
 ff_read_packet(ast->sub_ctx, >sub_pkt);
 avcodec_parameters_copy(st->codecpar, 
ast->sub_ctx->streams[0]->codecpar);
 time_base = ast->sub_ctx->streams[0]->time_base;

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

[FFmpeg-cvslog] avformat/avidec: Check nb_streams in read_gab2_sub()

[Michael Niedermayer]

ffmpeg | branch: release/3.0 | Michael Niedermayer  | 
Wed Sep 28 16:14:08 2016 +0200| [8c43f320574d201fe1b696b133c08368f5f18508] | 
committer: Michael Niedermayer

avformat/avidec: Check nb_streams in read_gab2_sub()

Fixes null pointer dereference
Fixes: 1/null_point.avi

Found-by: 连一汉 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 2679ad4773aa356e7c3da5c68bc81f02a194617f)
Signed-off-by: Michael Niedermayer 

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

 libavformat/avidec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 2e053a3..7adb819 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1094,6 +1094,8 @@ static int read_gab2_sub(AVFormatContext *s, AVStream 
*st, AVPacket *pkt)
 goto error;
 
 if (!avformat_open_input(>sub_ctx, "", sub_demuxer, NULL)) {
+if (ast->sub_ctx->nb_streams != 1)
+goto error;
 ff_read_packet(ast->sub_ctx, >sub_pkt);
 *st->codec = *ast->sub_ctx->streams[0]->codec;
 ast->sub_ctx->streams[0]->codec->extradata = NULL;

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

[FFmpeg-cvslog] avformat/avidec: Check nb_streams in read_gab2_sub()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Wed 
Sep 28 16:14:08 2016 +0200| [2679ad4773aa356e7c3da5c68bc81f02a194617f] | 
committer: Michael Niedermayer

avformat/avidec: Check nb_streams in read_gab2_sub()

Fixes null pointer dereference
Fixes: 1/null_point.avi

Found-by: 连一汉 
Signed-off-by: Michael Niedermayer 

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

 libavformat/avidec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 96edfa8..2c81267 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1101,6 +1101,8 @@ static int read_gab2_sub(AVFormatContext *s, AVStream 
*st, AVPacket *pkt)
 goto error;
 
 if (!avformat_open_input(>sub_ctx, "", sub_demuxer, NULL)) {
+if (ast->sub_ctx->nb_streams != 1)
+goto error;
 ff_read_packet(ast->sub_ctx, >sub_pkt);
 avcodec_parameters_copy(st->codecpar, 
ast->sub_ctx->streams[0]->codecpar);
 time_base = ast->sub_ctx->streams[0]->time_base;

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