[FFmpeg-devel] [PATCH] avformat/mpeg: Check avio_read() return value in get_pts()

[Thierry Foucu]

On Fri, Aug 14, 2020, 4:08 PM Michael Niedermayer <michael at niedermayer.cc>
wrote:

> Found-by: Thierry Foucu <tfoucu at gmail.com>
> Fixes: Use-of-uninitialized-value
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavformat/mpeg.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
> index 265b2bd1ad..a5e17925ce 100644
> --- a/libavformat/mpeg.c
> +++ b/libavformat/mpeg.c
> @@ -147,9 +147,12 @@ static int mpegps_read_header(AVFormatContext *s)
>  static int64_t get_pts(AVIOContext *pb, int c)
>  {
>      uint8_t buf[5];
> +    int ret;
>
>      buf[0] = c < 0 ? avio_r8(pb) : c;
> -    avio_read(pb, buf + 1, 4);
> +    ret = avio_read(pb, buf + 1, 4);
> +    if (ret < 4)
> +        return AV_NOPTS_VALUE;
>
>      return ff_parse_pes_pts(buf);
>  }
> --
> 2.17.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".





Thanks.

I though also about this solution. This works as well.