Mercurial > libavformat.hg

changeset 3400:75d4db7ae5c9 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check for av_new_stream failure, fixes CID76 RUN2
author reimar
date Thu, 29 May 2008 15:22:45 +0000
parents d280eb6ace33
children 1ea33ee5ed04
files gxf.c
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gxf.c	Thu May 29 13:40:43 2008 +0000
+++ b/gxf.c	Thu May 29 15:22:45 2008 +0000
@@ -82,6 +82,8 @@
             return i;
     }
     st = av_new_stream(s, id);
+    if (!st)
+        return AVERROR(ENOMEM);
     switch (format) {
         case 3:
         case 4:
@@ -415,6 +417,7 @@
     while (!url_feof(pb)) {
         int track_type, track_id, ret;
         int field_nr;
+        int stream_index;
         if (!parse_packet_header(pb, &pkt_type, &pkt_len)) {
             if (!url_feof(pb))
                 av_log(s, AV_LOG_ERROR, "GXF: sync lost\n");
@@ -435,6 +438,9 @@
         pkt_len -= 16;
         track_type = get_byte(pb);
         track_id = get_byte(pb);
+        stream_index = get_sindex(s, track_id, track_type);
+        if (stream_index < 0)
+            return stream_index;
         field_nr = get_be32(pb);
         get_be32(pb); // field information
         get_be32(pb); // "timeline" field number
@@ -444,7 +450,7 @@
         // field information, it might be better to take this into account
         // as well.
         ret = av_get_packet(pb, pkt, pkt_len);
-        pkt->stream_index = get_sindex(s, track_id, track_type);
+        pkt->stream_index = stream_index;
         pkt->dts = field_nr;
         return ret;
     }