* [FFmpeg-devel] [PATCH] avcodec/jpeg2000htdec: Check for invalid magref length.
@ 2023-06-05 18:04 etemesicaleb
2023-06-06 16:20 ` James Almer
0 siblings, 1 reply; 6+ messages in thread
From: etemesicaleb @ 2023-06-05 18:04 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: caleb, pal
From: caleb <etemesicaleb@gmail.com>
---
libavcodec/jpeg2000htdec.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/libavcodec/jpeg2000htdec.c b/libavcodec/jpeg2000htdec.c
index 51cd96e0f1..474d671ee0 100644
--- a/libavcodec/jpeg2000htdec.c
+++ b/libavcodec/jpeg2000htdec.c
@@ -1101,8 +1101,8 @@ 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(const Jpeg2000DecoderContext *s,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)
{
StateVars mag_ref = { 0 };
@@ -1111,6 +1111,10 @@ jpeg2000_decode_magref_segment(Jpeg2000Cblk *cblk, uint16_t width, uint16_t bloc
uint16_t i_start = 0;
int32_t *sp;
+ if (magref_length < 2){
+ av_log(s->avctx,AV_LOG_ERROR,"Invalid magnitude refinement length\n");
+ return AVERROR_INVALIDDATA;
+ }
jpeg2000_init_mag_ref(&mag_ref, magref_length);
for (int n1 = 0; n1 < num_v_stripe; n1++) {
@@ -1261,7 +1265,7 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c
pLSB - 1, sample_buf, block_states);
if (cblk->npasses > 2)
- if ((ret = jpeg2000_decode_magref_segment(cblk, width, height, Dref, Lref,
+ if ((ret = jpeg2000_decode_magref_segment(s,cblk, width, height, Dref, Lref,
pLSB - 1, sample_buf, block_states)) < 0)
goto free;
--
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] avcodec/jpeg2000htdec: Check for invalid magref length.
2023-06-05 18:04 [FFmpeg-devel] [PATCH] avcodec/jpeg2000htdec: Check for invalid magref length etemesicaleb
@ 2023-06-06 16:20 ` James Almer
2023-06-07 7:02 ` Caleb Etemesi
0 siblings, 1 reply; 6+ messages in thread
From: James Almer @ 2023-06-06 16:20 UTC (permalink / raw)
To: ffmpeg-devel
On 6/5/2023 3:04 PM, etemesicaleb@gmail.com wrote:
> From: caleb <etemesicaleb@gmail.com>
>
> ---
> libavcodec/jpeg2000htdec.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/jpeg2000htdec.c b/libavcodec/jpeg2000htdec.c
> index 51cd96e0f1..474d671ee0 100644
> --- a/libavcodec/jpeg2000htdec.c
> +++ b/libavcodec/jpeg2000htdec.c
> @@ -1101,8 +1101,8 @@ 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(const Jpeg2000DecoderContext *s,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)
This could be split in three lines.
> {
>
> StateVars mag_ref = { 0 };
> @@ -1111,6 +1111,10 @@ jpeg2000_decode_magref_segment(Jpeg2000Cblk *cblk, uint16_t width, uint16_t bloc
> uint16_t i_start = 0;
> int32_t *sp;
>
> + if (magref_length < 2){
> + av_log(s->avctx,AV_LOG_ERROR,"Invalid magnitude refinement length\n");
> + return AVERROR_INVALIDDATA;
> + }
Why not add this check and log call before calling
jpeg2000_decode_magref_segment()? That way you don't need to add
Jpeg2000DecoderContext as a parameter to it.
> jpeg2000_init_mag_ref(&mag_ref, magref_length);
>
> for (int n1 = 0; n1 < num_v_stripe; n1++) {
> @@ -1261,7 +1265,7 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c
> pLSB - 1, sample_buf, block_states);
>
> if (cblk->npasses > 2)
> - if ((ret = jpeg2000_decode_magref_segment(cblk, width, height, Dref, Lref,
> + if ((ret = jpeg2000_decode_magref_segment(s,cblk, width, height, Dref, Lref,
> pLSB - 1, sample_buf, block_states)) < 0)
> goto free;
>
_______________________________________________
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] avcodec/jpeg2000htdec: Check for invalid magref length.
2023-06-06 16:20 ` James Almer
@ 2023-06-07 7:02 ` Caleb Etemesi
0 siblings, 0 replies; 6+ messages in thread
From: Caleb Etemesi @ 2023-06-07 7:02 UTC (permalink / raw)
To: FFmpeg development discussions and patches
will send updated patch with changes in a few
On Tue, 6 Jun 2023, 19:20 James Almer, <jamrial@gmail.com> wrote:
> On 6/5/2023 3:04 PM, etemesicaleb@gmail.com wrote:
> > From: caleb <etemesicaleb@gmail.com>
> >
> > ---
> > libavcodec/jpeg2000htdec.c | 10 +++++++---
> > 1 file changed, 7 insertions(+), 3 deletions(-)
> >
> > diff --git a/libavcodec/jpeg2000htdec.c b/libavcodec/jpeg2000htdec.c
> > index 51cd96e0f1..474d671ee0 100644
> > --- a/libavcodec/jpeg2000htdec.c
> > +++ b/libavcodec/jpeg2000htdec.c
> > @@ -1101,8 +1101,8 @@ 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(const Jpeg2000DecoderContext
> *s,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)
>
> This could be split in three lines.
>
> > {
> >
> > StateVars mag_ref = { 0 };
> > @@ -1111,6 +1111,10 @@ jpeg2000_decode_magref_segment(Jpeg2000Cblk
> *cblk, uint16_t width, uint16_t bloc
> > uint16_t i_start = 0;
> > int32_t *sp;
> >
> > + if (magref_length < 2){
> > + av_log(s->avctx,AV_LOG_ERROR,"Invalid magnitude refinement
> length\n");
> > + return AVERROR_INVALIDDATA;
> > + }
>
> Why not add this check and log call before calling
> jpeg2000_decode_magref_segment()? That way you don't need to add
> Jpeg2000DecoderContext as a parameter to it.
>
> > jpeg2000_init_mag_ref(&mag_ref, magref_length);
> >
> > for (int n1 = 0; n1 < num_v_stripe; n1++) {
> > @@ -1261,7 +1265,7 @@ ff_jpeg2000_decode_htj2k(const
> Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c
> > pLSB - 1, sample_buf, block_states);
> >
> > if (cblk->npasses > 2)
> > - if ((ret = jpeg2000_decode_magref_segment(cblk, width, height,
> Dref, Lref,
> > + if ((ret = jpeg2000_decode_magref_segment(s,cblk, width,
> height, Dref, Lref,
> > pLSB - 1, sample_buf,
> block_states)) < 0)
> > goto free;
> >
> _______________________________________________
> 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] avcodec/jpeg2000htdec: Check for invalid magref length.
2023-06-19 15:47 ` Caleb Etemesi
@ 2023-06-19 21:14 ` Michael Niedermayer
0 siblings, 0 replies; 6+ messages in thread
From: Michael Niedermayer @ 2023-06-19 21:14 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 422 bytes --]
On Mon, Jun 19, 2023 at 06:47:16PM +0300, Caleb Etemesi wrote:
> Ping on this?
will apply
sorry for not looking sooner, i thought someone else would
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Into a blind darkness they enter who follow after the Ignorance,
they as if into a greater darkness enter who devote themselves
to the Knowledge alone. -- Isha Upanishad
[-- 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] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avcodec/jpeg2000htdec: Check for invalid magref length.
2023-06-07 7:34 etemesicaleb
@ 2023-06-19 15:47 ` Caleb Etemesi
2023-06-19 21:14 ` Michael Niedermayer
0 siblings, 1 reply; 6+ messages in thread
From: Caleb Etemesi @ 2023-06-19 15:47 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Michael Niedermayer
Ping on this?
On Wed, Jun 7, 2023 at 10:35 AM <etemesicaleb@gmail.com> wrote:
> 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".
^ permalink raw reply [flat|nested] 6+ messages in thread
* [FFmpeg-devel] [PATCH] avcodec/jpeg2000htdec: Check for invalid magref length.
@ 2023-06-07 7:34 etemesicaleb
2023-06-19 15:47 ` Caleb Etemesi
0 siblings, 1 reply; 6+ messages in thread
From: etemesicaleb @ 2023-06-07 7:34 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: caleb, pal
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".
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-06-19 21:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-05 18:04 [FFmpeg-devel] [PATCH] avcodec/jpeg2000htdec: Check for invalid magref length etemesicaleb
2023-06-06 16:20 ` James Almer
2023-06-07 7:02 ` Caleb Etemesi
2023-06-07 7:34 etemesicaleb
2023-06-19 15:47 ` Caleb Etemesi
2023-06-19 21:14 ` 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