[FFmpeg-devel] [PATCH] lavc/flacdec: Increase residual limit from INT_MAX to UINT_MAX

[Michael Niedermayer]

On Fri, Apr 29, 2022 at 04:48:23PM +0200, Martijn van Beurden wrote:
> Op wo 6 apr. 2022 om 09:12 schreef Martijn van Beurden <mvanb1 at gmail.com>:
> >
> > Op di 5 apr. 2022 om 15:37 schreef Martijn van Beurden <mvanb1 at gmail.com>:
> > >
> > > ---
> > >  libavcodec/flacdec.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
> > > index dd6026f9de..cb32d7cae8 100644
> > > --- a/libavcodec/flacdec.c
> > > +++ b/libavcodec/flacdec.c
> > > @@ -260,7 +260,7 @@ static int decode_residuals(FLACContext *s, int32_t *decoded, int pred_order)
> > >              for (; i < samples; i++)
> > >                  *decoded++ = get_sbits_long(&gb, tmp);
> > >          } else {
> > > -            int real_limit = tmp ? (INT_MAX >> tmp) + 2 : INT_MAX;
> > > +            int real_limit = (tmp > 1) ? (INT_MAX >> (tmp - 1)) + 2 : INT_MAX;
> > >              for (; i < samples; i++) {
> > >                  int v = get_sr_golomb_flac(&gb, tmp, real_limit, 1);
> > >                  if (v == 0x80000000){
> > > --
> > > 2.30.2
> > >
> >
> > A file needing this patch to decode properly can be found here:
> > https://github.com/ktmf01/flac-test-files/blob/main/subset/63%20-%20predictor%20overflow%20check%2C%2024-bit.flac
> >
> > Kind regards, Martijn van Beurden
> 
> Hereby I'd like to once more bring this patch to the attention of the
> mailinglist.

will apply

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Take away the freedom of one citizen and you will be jailed, take away
the freedom of all citizens and you will be congratulated by your peers
in Parliament.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20220430/145c0dcc/attachment.sig>