* [FFmpeg-devel] [PATCH] avcodec/g729_parser: Check channels
@ 2022-02-27 13:50 Michael Niedermayer
2022-02-27 14:02 ` Paul B Mahol
0 siblings, 1 reply; 3+ messages in thread
From: Michael Niedermayer @ 2022-02-27 13:50 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Fixes: signed integer overflow: 10 * 808464428 cannot be represented in type 'int'
Fixes: assertion failure
Fixes: ticket9651
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavcodec/g729_parser.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavcodec/g729_parser.c b/libavcodec/g729_parser.c
index 8c06ce4ee6..4dcdeab651 100644
--- a/libavcodec/g729_parser.c
+++ b/libavcodec/g729_parser.c
@@ -48,6 +48,9 @@ static int g729_parse(AVCodecParserContext *s1, AVCodecContext *avctx,
s->block_size = (avctx->bit_rate < 8000) ? G729D_6K4_BLOCK_SIZE : G729_8K_BLOCK_SIZE;
if (avctx->codec_id == AV_CODEC_ID_ACELP_KELVIN)
s->block_size++;
+ // channels > 2 is invalid, we pass the packet on unchanged
+ if (avctx->channels > 2)
+ s->block_size = 0;
s->block_size *= avctx->channels;
s->duration = avctx->frame_size;
}
--
2.17.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] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avcodec/g729_parser: Check channels
2022-02-27 13:50 [FFmpeg-devel] [PATCH] avcodec/g729_parser: Check channels Michael Niedermayer
@ 2022-02-27 14:02 ` Paul B Mahol
2022-03-07 23:30 ` Michael Niedermayer
0 siblings, 1 reply; 3+ messages in thread
From: Paul B Mahol @ 2022-02-27 14:02 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Sun, Feb 27, 2022 at 2:51 PM Michael Niedermayer <michael@niedermayer.cc>
wrote:
> Fixes: signed integer overflow: 10 * 808464428 cannot be represented in
> type 'int'
> Fixes: assertion failure
> Fixes: ticket9651
>
LGTM
Is it possible for parser get 0 channels as input, so it could
theoretically loop forever?
>
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
> libavcodec/g729_parser.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/libavcodec/g729_parser.c b/libavcodec/g729_parser.c
> index 8c06ce4ee6..4dcdeab651 100644
> --- a/libavcodec/g729_parser.c
> +++ b/libavcodec/g729_parser.c
> @@ -48,6 +48,9 @@ static int g729_parse(AVCodecParserContext *s1,
> AVCodecContext *avctx,
> s->block_size = (avctx->bit_rate < 8000) ? G729D_6K4_BLOCK_SIZE :
> G729_8K_BLOCK_SIZE;
> if (avctx->codec_id == AV_CODEC_ID_ACELP_KELVIN)
> s->block_size++;
> + // channels > 2 is invalid, we pass the packet on unchanged
> + if (avctx->channels > 2)
> + s->block_size = 0;
> s->block_size *= avctx->channels;
> s->duration = avctx->frame_size;
> }
> --
> 2.17.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] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avcodec/g729_parser: Check channels
2022-02-27 14:02 ` Paul B Mahol
@ 2022-03-07 23:30 ` Michael Niedermayer
0 siblings, 0 replies; 3+ messages in thread
From: Michael Niedermayer @ 2022-03-07 23:30 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 672 bytes --]
On Sun, Feb 27, 2022 at 03:02:46PM +0100, Paul B Mahol wrote:
> On Sun, Feb 27, 2022 at 2:51 PM Michael Niedermayer <michael@niedermayer.cc>
> wrote:
>
> > Fixes: signed integer overflow: 10 * 808464428 cannot be represented in
> > type 'int'
> > Fixes: assertion failure
> > Fixes: ticket9651
> >
>
>
> LGTM
will apply
>
> Is it possible for parser get 0 channels as input, so it could
> theoretically loop forever?
there is a check for block_size == 0 a few lines later
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Democracy is the form of government in which you can choose your dictator
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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] 3+ messages in thread
end of thread, other threads:[~2022-03-07 23:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-27 13:50 [FFmpeg-devel] [PATCH] avcodec/g729_parser: Check channels Michael Niedermayer
2022-02-27 14:02 ` Paul B Mahol
2022-03-07 23:30 ` Michael Niedermayer
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