[FFmpeg-cvslog] matroskadec: fix NULL pointer dereference in webm_dash_manifest_read_header

[Andreas Cadhalpun]

ffmpeg | branch: release/2.8 | Andreas Cadhalpun 
 | Tue Nov  8 00:42:23 2016 +0100| 
[3148d1c25f229e272a9242bfd81eacd6ce3ff716] | committer: Andreas Cadhalpun

matroskadec: fix NULL pointer dereference in webm_dash_manifest_read_header

The code assumes that s->streams[0] is valid.

Reviewed-by: Michael Niedermayer 
Signed-off-by: Andreas Cadhalpun 
(cherry picked from commit ff100c9dd97d2f1f456ff38b192edf84f9744738)
Signed-off-by: Andreas Cadhalpun 

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

 libavformat/matroskadec.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 3449a29..a52c4f0 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -3465,6 +3465,11 @@ static int 
webm_dash_manifest_read_header(AVFormatContext *s)
 av_log(s, AV_LOG_ERROR, "Failed to read file headers\n");
 return -1;
 }
+if (!s->nb_streams) {
+matroska_read_close(s);
+av_log(s, AV_LOG_ERROR, "No streams found\n");
+return AVERROR_INVALIDDATA;
+}
 
 if (!matroska->is_live) {
 buf = av_asprintf("%g", matroska->duration);

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

[FFmpeg-cvslog] matroskadec: fix NULL pointer dereference in webm_dash_manifest_read_header

[Andreas Cadhalpun]

ffmpeg | branch: release/3.0 | Andreas Cadhalpun 
 | Tue Nov  8 00:42:23 2016 +0100| 
[5801482379cb053c2901da1058e86365aac563a1] | committer: Andreas Cadhalpun

matroskadec: fix NULL pointer dereference in webm_dash_manifest_read_header

The code assumes that s->streams[0] is valid.

Reviewed-by: Michael Niedermayer 
Signed-off-by: Andreas Cadhalpun 
(cherry picked from commit ff100c9dd97d2f1f456ff38b192edf84f9744738)
Signed-off-by: Andreas Cadhalpun 

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

 libavformat/matroskadec.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index d788232..94c4639 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -3579,6 +3579,11 @@ static int 
webm_dash_manifest_read_header(AVFormatContext *s)
 av_log(s, AV_LOG_ERROR, "Failed to read file headers\n");
 return -1;
 }
+if (!s->nb_streams) {
+matroska_read_close(s);
+av_log(s, AV_LOG_ERROR, "No streams found\n");
+return AVERROR_INVALIDDATA;
+}
 
 if (!matroska->is_live) {
 buf = av_asprintf("%g", matroska->duration);

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

[FFmpeg-cvslog] matroskadec: fix NULL pointer dereference in webm_dash_manifest_read_header

[Andreas Cadhalpun]

ffmpeg | branch: release/3.1 | Andreas Cadhalpun 
 | Tue Nov  8 00:42:23 2016 +0100| 
[c19e9657049d1ac67aee658b2f7ad12ba051b0cd] | committer: Andreas Cadhalpun

matroskadec: fix NULL pointer dereference in webm_dash_manifest_read_header

The code assumes that s->streams[0] is valid.

Reviewed-by: Michael Niedermayer 
Signed-off-by: Andreas Cadhalpun 
(cherry picked from commit ff100c9dd97d2f1f456ff38b192edf84f9744738)
Signed-off-by: Andreas Cadhalpun 

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

 libavformat/matroskadec.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index f3d701f..3c7ab1c 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -3749,6 +3749,11 @@ static int 
webm_dash_manifest_read_header(AVFormatContext *s)
 av_log(s, AV_LOG_ERROR, "Failed to read file headers\n");
 return -1;
 }
+if (!s->nb_streams) {
+matroska_read_close(s);
+av_log(s, AV_LOG_ERROR, "No streams found\n");
+return AVERROR_INVALIDDATA;
+}
 
 if (!matroska->is_live) {
 buf = av_asprintf("%g", matroska->duration);

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

[FFmpeg-cvslog] matroskadec: fix NULL pointer dereference in webm_dash_manifest_read_header

[Andreas Cadhalpun]

ffmpeg | branch: master | Andreas Cadhalpun  
| Tue Nov  8 00:42:23 2016 +0100| [ff100c9dd97d2f1f456ff38b192edf84f9744738] | 
committer: Andreas Cadhalpun

matroskadec: fix NULL pointer dereference in webm_dash_manifest_read_header

The code assumes that s->streams[0] is valid.

Reviewed-by: Michael Niedermayer 
Signed-off-by: Andreas Cadhalpun 

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

 libavformat/matroskadec.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index d2a691b..f79511e 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -3776,6 +3776,11 @@ static int 
webm_dash_manifest_read_header(AVFormatContext *s)
 av_log(s, AV_LOG_ERROR, "Failed to read file headers\n");
 return -1;
 }
+if (!s->nb_streams) {
+matroska_read_close(s);
+av_log(s, AV_LOG_ERROR, "No streams found\n");
+return AVERROR_INVALIDDATA;
+}
 
 if (!matroska->is_live) {
 buf = av_asprintf("%g", matroska->duration);

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

[FFmpeg-cvslog] matroskadec: fix NULL pointer dereference

[Andreas Cadhalpun]

ffmpeg | branch: master | Andreas Cadhalpun  
| Sun Oct 16 21:47:00 2016 +0200| [eb751f06db9f627c8b5c63d08836a39f7572bf56] | 
committer: Andreas Cadhalpun

matroskadec: fix NULL pointer dereference

The problem was introduced in commit 1273bc6.

Reviewed-by: James Almer 
Signed-off-by: Andreas Cadhalpun 

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

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

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 8847c62..a5d3c0e 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1759,7 +1759,7 @@ static int mkv_field_order(MatroskaDemuxContext 
*matroska, int64_t field_order)
 
 /* workaround a bug in our Matroska muxer, introduced in version 57.36 
alongside
  * this function, and fixed in 57.52 */
-if (sscanf(matroska->muxingapp, "Lavf%d.%d.%d", , , ) == 
3)
+if (matroska->muxingapp && sscanf(matroska->muxingapp, "Lavf%d.%d.%d", 
, , ) == 3)
 bttb = (major == 57 && minor >= 36 && minor <= 51 && micro >= 100);
 
 switch (field_order) {

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