[FFmpeg-cvslog] avformat/sierravmd: Don't return packets for non-existing stream
Andreas Rheinhardt
git at videolan.org
Sun Aug 9 20:16:51 EEST 2020
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Thu Aug 6 01:21:38 2020 +0200| [ea8f8d28d096827636f518b6074d31fc472d03c6] | committer: Andreas Rheinhardt
avformat/sierravmd: Don't return packets for non-existing stream
It leads to an assert in ff_read_packet().
Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea8f8d28d096827636f518b6074d31fc472d03c6
---
libavformat/sierravmd.c | 4 ++++
1 file changed, 4 insertions(+)
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;
More information about the ffmpeg-cvslog
mailing list