* [FFmpeg-devel] [PATCH] lavc/binkaudio: reset input packet on errors
@ 2023-06-17 2:54 Anton Khirnov
2023-06-17 6:35 ` Paul B Mahol
0 siblings, 1 reply; 6+ messages in thread
From: Anton Khirnov @ 2023-06-17 2:54 UTC (permalink / raw)
To: ffmpeg-devel
Make sure we don't repeatedly try to decode the same packet, making no
progress and possibly causing an infinite loop.
---
libavcodec/binkaudio.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index f28ecba760..265f93a822 100644
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -325,7 +325,7 @@ again:
if (s->ch_offset == 0) {
frame->nb_samples = s->frame_len;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
- return ret;
+ goto fail;
if (!new_pkt)
frame->pts = AV_NOPTS_VALUE;
}
@@ -334,8 +334,8 @@ again:
avctx->codec->id == AV_CODEC_ID_BINKAUDIO_DCT,
FFMIN(MAX_CHANNELS, s->channels - s->ch_offset), s->ch_offset)) {
av_log(avctx, AV_LOG_ERROR, "Incomplete packet\n");
- s->ch_offset = 0;
- return AVERROR_INVALIDDATA;
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
}
s->ch_offset += MAX_CHANNELS;
get_bits_align32(gb);
--
2.40.1
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [FFmpeg-devel] [PATCH] lavc/binkaudio: reset input packet on errors
2023-06-17 2:54 [FFmpeg-devel] [PATCH] lavc/binkaudio: reset input packet on errors Anton Khirnov
@ 2023-06-17 6:35 ` Paul B Mahol
2023-06-17 7:16 ` Anton Khirnov
0 siblings, 1 reply; 6+ messages in thread
From: Paul B Mahol @ 2023-06-17 6:35 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Sat, Jun 17, 2023 at 4:54 AM Anton Khirnov <anton@khirnov.net> wrote:
> Make sure we don't repeatedly try to decode the same packet, making no
> progress and possibly causing an infinite loop.
>
Doesn't all error paths, bellow goto label in function, needs this (reset
of ch_offset to 0 and unref of pkt) ?
> ---
> libavcodec/binkaudio.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
> index f28ecba760..265f93a822 100644
> --- a/libavcodec/binkaudio.c
> +++ b/libavcodec/binkaudio.c
> @@ -325,7 +325,7 @@ again:
> if (s->ch_offset == 0) {
> frame->nb_samples = s->frame_len;
> if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
> - return ret;
> + goto fail;
> if (!new_pkt)
> frame->pts = AV_NOPTS_VALUE;
> }
> @@ -334,8 +334,8 @@ again:
> avctx->codec->id == AV_CODEC_ID_BINKAUDIO_DCT,
> FFMIN(MAX_CHANNELS, s->channels - s->ch_offset),
> s->ch_offset)) {
> av_log(avctx, AV_LOG_ERROR, "Incomplete packet\n");
> - s->ch_offset = 0;
> - return AVERROR_INVALIDDATA;
> + ret = AVERROR_INVALIDDATA;
> + goto fail;
> }
> s->ch_offset += MAX_CHANNELS;
> get_bits_align32(gb);
> --
> 2.40.1
>
> _______________________________________________
> 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".
>
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [FFmpeg-devel] [PATCH] lavc/binkaudio: reset input packet on errors
2023-06-17 6:35 ` Paul B Mahol
@ 2023-06-17 7:16 ` Anton Khirnov
2023-06-17 7:39 ` Paul B Mahol
0 siblings, 1 reply; 6+ messages in thread
From: Anton Khirnov @ 2023-06-17 7:16 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Quoting Paul B Mahol (2023-06-17 08:35:21)
> On Sat, Jun 17, 2023 at 4:54 AM Anton Khirnov <anton@khirnov.net> wrote:
>
> > Make sure we don't repeatedly try to decode the same packet, making no
> > progress and possibly causing an infinite loop.
> >
>
> Doesn't all error paths, bellow goto label in function, needs this (reset
> of ch_offset to 0 and unref of pkt) ?
I see no other error paths in that function, beside handling the failure
of ff_decode_get_packet().
--
Anton Khirnov
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH] lavc/binkaudio: reset input packet on errors
2023-06-17 7:16 ` Anton Khirnov
@ 2023-06-17 7:39 ` Paul B Mahol
2023-06-17 7:46 ` Anton Khirnov
0 siblings, 1 reply; 6+ messages in thread
From: Paul B Mahol @ 2023-06-17 7:39 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Sat, Jun 17, 2023 at 9:16 AM Anton Khirnov <anton@khirnov.net> wrote:
> Quoting Paul B Mahol (2023-06-17 08:35:21)
> > On Sat, Jun 17, 2023 at 4:54 AM Anton Khirnov <anton@khirnov.net> wrote:
> >
> > > Make sure we don't repeatedly try to decode the same packet, making no
> > > progress and possibly causing an infinite loop.
> > >
> >
> > Doesn't all error paths, bellow goto label in function, needs this (reset
> > of ch_offset to 0 and unref of pkt) ?
>
> I see no other error paths in that function, beside handling the failure
> of ff_decode_get_packet().
>
>
get_buffer?
> --
> Anton Khirnov
> _______________________________________________
> 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".
>
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH] lavc/binkaudio: reset input packet on errors
2023-06-17 7:39 ` Paul B Mahol
@ 2023-06-17 7:46 ` Anton Khirnov
2023-06-17 7:49 ` Paul B Mahol
0 siblings, 1 reply; 6+ messages in thread
From: Anton Khirnov @ 2023-06-17 7:46 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Quoting Paul B Mahol (2023-06-17 09:39:24)
> On Sat, Jun 17, 2023 at 9:16 AM Anton Khirnov <anton@khirnov.net> wrote:
>
> > Quoting Paul B Mahol (2023-06-17 08:35:21)
> > > On Sat, Jun 17, 2023 at 4:54 AM Anton Khirnov <anton@khirnov.net> wrote:
> > >
> > > > Make sure we don't repeatedly try to decode the same packet, making no
> > > > progress and possibly causing an infinite loop.
> > > >
> > >
> > > Doesn't all error paths, bellow goto label in function, needs this (reset
> > > of ch_offset to 0 and unref of pkt) ?
> >
> > I see no other error paths in that function, beside handling the failure
> > of ff_decode_get_packet().
> >
> >
> get_buffer?
I am adding goto fail for the get_buffer() call in this patch, so I
don't understand what your concern is.
--
Anton Khirnov
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH] lavc/binkaudio: reset input packet on errors
2023-06-17 7:46 ` Anton Khirnov
@ 2023-06-17 7:49 ` Paul B Mahol
0 siblings, 0 replies; 6+ messages in thread
From: Paul B Mahol @ 2023-06-17 7:49 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Sat, Jun 17, 2023 at 9:47 AM Anton Khirnov <anton@khirnov.net> wrote:
> Quoting Paul B Mahol (2023-06-17 09:39:24)
> > On Sat, Jun 17, 2023 at 9:16 AM Anton Khirnov <anton@khirnov.net> wrote:
> >
> > > Quoting Paul B Mahol (2023-06-17 08:35:21)
> > > > On Sat, Jun 17, 2023 at 4:54 AM Anton Khirnov <anton@khirnov.net>
> wrote:
> > > >
> > > > > Make sure we don't repeatedly try to decode the same packet,
> making no
> > > > > progress and possibly causing an infinite loop.
> > > > >
> > > >
> > > > Doesn't all error paths, bellow goto label in function, needs this
> (reset
> > > > of ch_offset to 0 and unref of pkt) ?
> > >
> > > I see no other error paths in that function, beside handling the
> failure
> > > of ff_decode_get_packet().
> > >
> > >
> > get_buffer?
>
> I am adding goto fail for the get_buffer() call in this patch, so I
> don't understand what your concern is.
>
Yes, patch ok.
>
> --
> Anton Khirnov
> _______________________________________________
> 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".
>
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-06-17 7:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-17 2:54 [FFmpeg-devel] [PATCH] lavc/binkaudio: reset input packet on errors Anton Khirnov
2023-06-17 6:35 ` Paul B Mahol
2023-06-17 7:16 ` Anton Khirnov
2023-06-17 7:39 ` Paul B Mahol
2023-06-17 7:46 ` Anton Khirnov
2023-06-17 7:49 ` Paul B Mahol
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git