[FFmpeg-devel] [PATCH 3/3] avformat/fifo: check for flushed packets and timeshift

[Marton Balint]

On Sun, 16 May 2021, Michael Niedermayer wrote:

> Fixes: CID1464151 Dereference after null check
>
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
> libavformat/fifo.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/fifo.c b/libavformat/fifo.c
> index 620fffa032..50656f78b7 100644
> --- a/libavformat/fifo.c
> +++ b/libavformat/fifo.c
> @@ -593,7 +593,7 @@ static int fifo_write_packet(AVFormatContext *avf, AVPacket *pkt)
>         goto fail;
>     }
>
> -    if (fifo->timeshift && pkt->dts != AV_NOPTS_VALUE)
> +    if (fifo->timeshift && pkt && pkt->dts != AV_NOPTS_VALUE)
>         atomic_fetch_add_explicit(&fifo->queue_duration, next_duration(avf, pkt, &fifo->last_sent_dts), memory_order_relaxed);
>
>     return ret;

LGTM, thanks.

Marton