[FFmpeg-devel] [PATCH 3/3] avformat/sierravmd: Don't return packets for non-existing stream

[Michael Niedermayer]

On Thu, Aug 06, 2020 at 01:33:58AM +0200, Andreas Rheinhardt wrote:
> It leads to an assert in ff_read_packet().
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> ---
>  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;

probably ok

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

"I am not trying to be anyone's saviour, I'm trying to think about the
 future and not be sad" - Elon Musk

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20200806/dbd269a3/attachment.sig>