[FFmpeg-devel] [PATCH] avcodec/pcm_rechunk_bsf: assert that in_pkt is empty after merging its data into out_pkt

[FFmpeg-devel] [PATCH] avcodec/pcm_rechunk_bsf: assert that in_pkt is empty after merging its data into out_pkt

[James Almer]

If it's not empty here, then a leak would ocurr immediately after.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/pcm_rechunk_bsf.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/pcm_rechunk_bsf.c b/libavcodec/pcm_rechunk_bsf.c
index 032f914916..28b5722ac9 100644
--- a/libavcodec/pcm_rechunk_bsf.c
+++ b/libavcodec/pcm_rechunk_bsf.c
@@ -139,6 +139,7 @@ static int rechunk_filter(AVBSFContext *ctx, AVPacket *pkt)
                     av_packet_move_ref(pkt, s->out_pkt);
                     return send_packet(s, nb_samples, pkt);
                 }
+                av_assert0(!s->in_pkt->size);
             } else if (s->in_pkt->size > data_size) {
                 ret = av_packet_ref(pkt, s->in_pkt);
                 if (ret < 0)
-- 
2.40.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avcodec/pcm_rechunk_bsf: assert that in_pkt is empty after merging its data into out_pkt

[James Almer]

On 4/17/2023 8:59 PM, James Almer wrote:
> If it's not empty here, then a leak would ocurr immediately after.
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>   libavcodec/pcm_rechunk_bsf.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/libavcodec/pcm_rechunk_bsf.c b/libavcodec/pcm_rechunk_bsf.c
> index 032f914916..28b5722ac9 100644
> --- a/libavcodec/pcm_rechunk_bsf.c
> +++ b/libavcodec/pcm_rechunk_bsf.c
> @@ -139,6 +139,7 @@ static int rechunk_filter(AVBSFContext *ctx, AVPacket *pkt)
>                       av_packet_move_ref(pkt, s->out_pkt);
>                       return send_packet(s, nb_samples, pkt);
>                   }
> +                av_assert0(!s->in_pkt->size);
>               } else if (s->in_pkt->size > data_size) {
>                   ret = av_packet_ref(pkt, s->in_pkt);
>                   if (ret < 0)

Will apply.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".