[FFmpeg-devel] [PATCH] avcodec/jpeg2000dec: fix HT block decoder issue #10905

[Michael Niedermayer]

On Fri, May 17, 2024 at 08:00:16PM +0000, WATANABE Osamu wrote:
> Signed-off-by: Pierre-Anthony Lemieux <pal at palemieux.com>
> ---
> libavcodec/jpeg2000htdec.c               | 122 ++++++++++++-----------
> tests/ref/fate/jpeg2000dec-ds0_ht_01_b11 |   2 +-
> 2 files changed, 63 insertions(+), 61 deletions(-)
> 
> diff --git a/libavcodec/jpeg2000htdec.c b/libavcodec/jpeg2000htdec.c
> index fa704b665e..62f70c32a8 100644
> --- a/libavcodec/jpeg2000htdec.c
> +++ b/libavcodec/jpeg2000htdec.c
> @@ -196,7 +196,7 @@ static void jpeg2000_bitbuf_refill_forward(StateVars *buffer, const uint8_t *arr
>     while (buffer->bits_left < 32) {
>         buffer->tmp = 0xFF;
>         buffer->bits = (buffer->last == 0xFF) ? 7 : 8;
> -        if (buffer->pos <= length) {
> +        if (buffer->pos < length) {
>             buffer->tmp = array[buffer->pos];
>             buffer->pos += 1;
>             buffer->last = buffer->tmp;
> @@ -508,17 +508,17 @@ static int jpeg2000_decode_sig_emb(const Jpeg2000DecoderContext *s, MelDecoderSt
> }
> 
> av_always_inline
> -static int jpeg2000_get_state(int x1, int x2, int width, int shift_by,
> +static int jpeg2000_get_state(int x1, int x2, int stride, int shift_by,

the first whitespace seems to have been lost this makes git reject the patch

Applying: avcodec/jpeg2000dec: fix HT block decoder issue #10905
error: corrupt patch at line 20
error: could not build fake ancestor

thx

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

What does censorship reveal? It reveals fear. -- Julian Assange
-------------- 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/20240518/4fd3eb03/attachment.sig>