From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH] avcodec/hevcdec: further constrain some slice header field values
Date: Thu, 20 Apr 2023 10:14:04 -0300
Message-ID: <20230420131404.8789-1-jamrial@gmail.com> (raw)
num_ref_idx_l0_active_minus1, num_ref_idx_l1_active_minus1, num_ref_idx_l0_default_active,
and num_ref_idx_l1_default_active are all in the range 1 to 15, inclusive.
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavcodec/hevc_ps.c | 10 ++++++++--
libavcodec/hevcdec.c | 6 +++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 7401ea23f5..f29f783f77 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -1762,8 +1762,14 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx,
pps->cabac_init_present_flag = get_bits1(gb);
- pps->num_ref_idx_l0_default_active = get_ue_golomb_long(gb) + 1;
- pps->num_ref_idx_l1_default_active = get_ue_golomb_long(gb) + 1;
+ pps->num_ref_idx_l0_default_active = get_ue_golomb_31(gb) + 1;
+ pps->num_ref_idx_l1_default_active = get_ue_golomb_31(gb) + 1;
+ if (pps->num_ref_idx_l0_default_active >= HEVC_MAX_REFS ||
+ pps->num_ref_idx_l1_default_active >= HEVC_MAX_REFS) {
+ av_log(avctx, AV_LOG_ERROR, "Too many default refs in PPS: %d/%d.\n",
+ pps->num_ref_idx_l0_default_active, pps->num_ref_idx_l1_default_active);
+ goto err;
+ }
pps->pic_init_qp_minus26 = get_se_golomb(gb);
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index 1a0beac901..0fa4fdd59d 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -773,11 +773,11 @@ static int hls_slice_header(HEVCContext *s)
sh->nb_refs[L1] = s->ps.pps->num_ref_idx_l1_default_active;
if (get_bits1(gb)) { // num_ref_idx_active_override_flag
- sh->nb_refs[L0] = get_ue_golomb_long(gb) + 1;
+ sh->nb_refs[L0] = get_ue_golomb_31(gb) + 1;
if (sh->slice_type == HEVC_SLICE_B)
- sh->nb_refs[L1] = get_ue_golomb_long(gb) + 1;
+ sh->nb_refs[L1] = get_ue_golomb_31(gb) + 1;
}
- if (sh->nb_refs[L0] > HEVC_MAX_REFS || sh->nb_refs[L1] > HEVC_MAX_REFS) {
+ if (sh->nb_refs[L0] >= HEVC_MAX_REFS || sh->nb_refs[L1] >= HEVC_MAX_REFS) {
av_log(s->avctx, AV_LOG_ERROR, "Too many refs: %d/%d.\n",
sh->nb_refs[L0], sh->nb_refs[L1]);
return AVERROR_INVALIDDATA;
--
2.40.0
_______________________________________________
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-04-20 13:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-20 13:14 James Almer [this message]
2023-04-22 14:13 ` James Almer
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=20230420131404.8789-1-jamrial@gmail.com \
--to=jamrial@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/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