| Message ID | 20230417235937.11038-1-jamrial@gmail.com |
|---|---|
| State | Accepted |
| Commit | 86645bf0a6b2a02b90bf0a17a14d7e750b1b9d40 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/pcm_rechunk_bsf: assert that in_pkt is empty after merging its data into out_pkt | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
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.
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)
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(+)