[FFmpeg-cvslog] gxf: avoid null ptr deref without streams.

Michael Niedermayer git at videolan.org
Sun Nov 11 21:30:53 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 11 20:57:45 2012 +0100| [5aedee4facb2295cfdeaf322bc67fd15323862d9] | committer: Michael Niedermayer

gxf: avoid null ptr deref without streams.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/gxf.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/gxf.c b/libavformat/gxf.c
index 0286439..4088088 100644
--- a/libavformat/gxf.c
+++ b/libavformat/gxf.c
@@ -270,15 +270,16 @@ static void gxf_track_tags(AVIOContext *pb, int *len, struct gxf_stream_info *si
  */
 static void gxf_read_index(AVFormatContext *s, int pkt_len) {
     AVIOContext *pb = s->pb;
-    AVStream *st = s->streams[0];
+    AVStream *st;
     uint32_t fields_per_map = avio_rl32(pb);
     uint32_t map_cnt = avio_rl32(pb);
     int i;
     pkt_len -= 8;
-    if (s->flags & AVFMT_FLAG_IGNIDX) {
+    if ((s->flags & AVFMT_FLAG_IGNIDX) || !s->streams) {
         avio_skip(pb, pkt_len);
         return;
     }
+    st = s->streams[0];
     if (map_cnt > 1000) {
         av_log(s, AV_LOG_ERROR, "too many index entries %u (%x)\n", map_cnt, map_cnt);
         map_cnt = 1000;



More information about the ffmpeg-cvslog mailing list