* [FFmpeg-devel] [PATCH] avcodec: Ignoring errors is only possible before the input end
@ 2023-06-03 19:44 Michael Niedermayer
2023-06-17 6:45 ` Paul B Mahol
0 siblings, 1 reply; 3+ messages in thread
From: Michael Niedermayer @ 2023-06-03 19:44 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Fixes: out of array read
Fixes: Ticket 10308
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavcodec/h263dec.c | 2 +-
libavcodec/mpeg4videodec.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index f4e7048a5f..68a618a7ed 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -281,7 +281,7 @@ static int decode_slice(MpegEncContext *s)
ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
s->mb_x, s->mb_y, ER_MB_ERROR & part_mask);
- if (s->avctx->err_recognition & AV_EF_IGNORE_ERR)
+ if ((s->avctx->err_recognition & AV_EF_IGNORE_ERR) && get_bits_left(&s->gb) > 0)
continue;
return AVERROR_INVALIDDATA;
}
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index d456e5dd11..30aec5e529 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -1437,7 +1437,7 @@ static inline int mpeg4_decode_block(Mpeg4DecContext *ctx, int16_t *block,
if (SHOW_UBITS(re, &s->gb, 1) == 0) {
av_log(s->avctx, AV_LOG_ERROR,
"1. marker bit missing in 3. esc\n");
- if (!(s->avctx->err_recognition & AV_EF_IGNORE_ERR))
+ if (!(s->avctx->err_recognition & AV_EF_IGNORE_ERR) || get_bits_left(&s->gb) <= 0)
return AVERROR_INVALIDDATA;
}
SKIP_CACHE(re, &s->gb, 1);
@@ -1448,7 +1448,7 @@ static inline int mpeg4_decode_block(Mpeg4DecContext *ctx, int16_t *block,
if (SHOW_UBITS(re, &s->gb, 1) == 0) {
av_log(s->avctx, AV_LOG_ERROR,
"2. marker bit missing in 3. esc\n");
- if (!(s->avctx->err_recognition & AV_EF_IGNORE_ERR))
+ if (!(s->avctx->err_recognition & AV_EF_IGNORE_ERR) || get_bits_left(&s->gb) <= 0)
return AVERROR_INVALIDDATA;
}
--
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: Ignoring errors is only possible before the input end
2023-06-03 19:44 [FFmpeg-devel] [PATCH] avcodec: Ignoring errors is only possible before the input end Michael Niedermayer
@ 2023-06-17 6:45 ` Paul B Mahol
2023-06-18 12:19 ` Michael Niedermayer
0 siblings, 1 reply; 3+ messages in thread
From: Paul B Mahol @ 2023-06-17 6:45 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Sat, Jun 3, 2023 at 9:44 PM Michael Niedermayer <michael@niedermayer.cc>
wrote:
> Fixes: out of array read
> Fixes: Ticket 10308
>
Did you forgot to apply this?
>
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
> libavcodec/h263dec.c | 2 +-
> libavcodec/mpeg4videodec.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
> index f4e7048a5f..68a618a7ed 100644
> --- a/libavcodec/h263dec.c
> +++ b/libavcodec/h263dec.c
> @@ -281,7 +281,7 @@ static int decode_slice(MpegEncContext *s)
> ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
> s->mb_x, s->mb_y, ER_MB_ERROR &
> part_mask);
>
> - if (s->avctx->err_recognition & AV_EF_IGNORE_ERR)
> + if ((s->avctx->err_recognition & AV_EF_IGNORE_ERR) &&
> get_bits_left(&s->gb) > 0)
> continue;
> return AVERROR_INVALIDDATA;
> }
> diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
> index d456e5dd11..30aec5e529 100644
> --- a/libavcodec/mpeg4videodec.c
> +++ b/libavcodec/mpeg4videodec.c
> @@ -1437,7 +1437,7 @@ static inline int mpeg4_decode_block(Mpeg4DecContext
> *ctx, int16_t *block,
> if (SHOW_UBITS(re, &s->gb, 1) == 0) {
> av_log(s->avctx, AV_LOG_ERROR,
> "1. marker bit missing in 3.
> esc\n");
> - if (!(s->avctx->err_recognition &
> AV_EF_IGNORE_ERR))
> + if (!(s->avctx->err_recognition &
> AV_EF_IGNORE_ERR) || get_bits_left(&s->gb) <= 0)
> return AVERROR_INVALIDDATA;
> }
> SKIP_CACHE(re, &s->gb, 1);
> @@ -1448,7 +1448,7 @@ static inline int mpeg4_decode_block(Mpeg4DecContext
> *ctx, int16_t *block,
> if (SHOW_UBITS(re, &s->gb, 1) == 0) {
> av_log(s->avctx, AV_LOG_ERROR,
> "2. marker bit missing in 3.
> esc\n");
> - if (!(s->avctx->err_recognition &
> AV_EF_IGNORE_ERR))
> + if (!(s->avctx->err_recognition &
> AV_EF_IGNORE_ERR) || get_bits_left(&s->gb) <= 0)
> return AVERROR_INVALIDDATA;
> }
>
> --
> 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: Ignoring errors is only possible before the input end
2023-06-17 6:45 ` Paul B Mahol
@ 2023-06-18 12:19 ` Michael Niedermayer
0 siblings, 0 replies; 3+ messages in thread
From: Michael Niedermayer @ 2023-06-18 12:19 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 477 bytes --]
On Sat, Jun 17, 2023 at 08:45:53AM +0200, Paul B Mahol wrote:
> On Sat, Jun 3, 2023 at 9:44 PM Michael Niedermayer <michael@niedermayer.cc>
> wrote:
>
> > Fixes: out of array read
> > Fixes: Ticket 10308
> >
>
> Did you forgot to apply this?
yes, ill apply it with my next git push
thx for reminding me
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
No snowflake in an avalanche ever feels responsible. -- Voltaire
[-- 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:[~2023-06-18 12:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-03 19:44 [FFmpeg-devel] [PATCH] avcodec: Ignoring errors is only possible before the input end Michael Niedermayer
2023-06-17 6:45 ` Paul B Mahol
2023-06-18 12:19 ` 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