aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt2020-08-06 01:21:38 +0200
committerAndreas Rheinhardt2020-08-09 19:07:23 +0200
commitea8f8d28d096827636f518b6074d31fc472d03c6 (patch)
tree73ddb69851ee27fb68f9fd7a0ea64449b2489874
parentc4a4fe938d435de9e9126d7e151fc370a6f5ee72 (diff)
avformat/sierravmd: Don't return packets for non-existing stream
It leads to an assert in ff_read_packet(). Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavformat/sierravmd.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c
index 531fc41531..40bcb77986 100644
--- a/libavformat/sierravmd.c
+++ b/libavformat/sierravmd.c
@@ -174,6 +174,8 @@ static int vmd_read_header(AVFormatContext *s)
avpriv_set_pts_info(vst, 33, num, den);
avpriv_set_pts_info(st, 33, num, den);
}
+ if (!s->nb_streams)
+ return AVERROR_INVALIDDATA;
toc_offset = AV_RL32(&vmd->vmd_header[812]);
vmd->frame_count = AV_RL16(&vmd->vmd_header[6]);
@@ -241,6 +243,8 @@ static int vmd_read_header(AVFormatContext *s)
current_audio_pts++;
break;
case 2: /* Video Chunk */
+ if (!vst)
+ break;
vmd->frame_table[total_frames].frame_offset = current_offset;
vmd->frame_table[total_frames].stream_index = vmd->video_stream_index;
vmd->frame_table[total_frames].frame_size = size;