From: etemesicaleb@gmail.com
To: ffmpeg-devel@ffmpeg.org
Cc: caleb <etemesicaleb@gmail.com>, pal@sandflow.com
Subject: [FFmpeg-devel] [PATCH] avcodec/jpeg2000htdec: Check for invalid magref length.
Date: Wed, 7 Jun 2023 10:34:34 +0300
Message-ID: <20230607073434.69790-1-etemesicaleb@gmail.com> (raw)
From: caleb <etemesicaleb@gmail.com>
---
libavcodec/jpeg2000htdec.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/libavcodec/jpeg2000htdec.c b/libavcodec/jpeg2000htdec.c
index 51cd96e0f1..4c4e54710d 100644
--- a/libavcodec/jpeg2000htdec.c
+++ b/libavcodec/jpeg2000htdec.c
@@ -1101,8 +1101,9 @@ static void jpeg2000_decode_sigprop_segment(Jpeg2000Cblk *cblk, uint16_t width,
* See procedure decodeSigPropMag at Rec. ITU-T T.814, 7.5.
*/
static int
-jpeg2000_decode_magref_segment(Jpeg2000Cblk *cblk, uint16_t width, uint16_t block_height, uint8_t *magref_segment,
- uint32_t magref_length, uint8_t pLSB, int32_t *sample_buf, uint8_t *block_states)
+jpeg2000_decode_magref_segment( uint16_t width, uint16_t block_height,
+ uint8_t *magref_segment,uint32_t magref_length,
+ uint8_t pLSB, int32_t *sample_buf, uint8_t *block_states)
{
StateVars mag_ref = { 0 };
@@ -1260,10 +1261,17 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c
jpeg2000_decode_sigprop_segment(cblk, width, height, Dref, Lref,
pLSB - 1, sample_buf, block_states);
- if (cblk->npasses > 2)
- if ((ret = jpeg2000_decode_magref_segment(cblk, width, height, Dref, Lref,
- pLSB - 1, sample_buf, block_states)) < 0)
+ if (cblk->npasses > 2) {
+
+ if (Lref < 2){
+ av_log(s->avctx,AV_LOG_ERROR,"Invalid magnitude refinement length\n");
+ ret = AVERROR_INVALIDDATA;
+ goto free;
+ }
+ if ((ret = jpeg2000_decode_magref_segment(width, height, Dref, Lref,
+ pLSB - 1, sample_buf, block_states)) < 0)
goto free;
+ }
pLSB = 31 - M_b;
--
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".
next reply other threads:[~2023-06-07 7:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 7:34 etemesicaleb [this message]
2023-06-19 15:47 ` Caleb Etemesi
2023-06-19 21:14 ` Michael Niedermayer
-- strict thread matches above, loose matches on Subject: below --
2023-06-05 18:04 etemesicaleb
2023-06-06 16:20 ` James Almer
2023-06-07 7:02 ` Caleb Etemesi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230607073434.69790-1-etemesicaleb@gmail.com \
--to=etemesicaleb@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=pal@sandflow.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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