diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-09-18 05:25:58 +0200 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2019-09-29 17:48:38 +0100 |
| commit | f3333c3c67e8825a4468120bb8aa0943c72c03f3 (patch) | |
| tree | 4a681aa02f48cfe33803aa218d39ecdcaa6e1b83 /libavcodec/cbs_h2645.c | |
| parent | e3f0ecfc57889de0e0a359ec30b77851d53cea87 (diff) | |
| download | ffmpeg-f3333c3c67e8825a4468120bb8aa0943c72c03f3.tar.gz | |
avcodec/cbs_h2645: Fix potential out-of-bounds array access
The maximum allowed index for an array access is FF_ARRAY_ELEMS - 1; yet
the current code allowed FF_ARRAY_ELEMS. This wasn't dangerous in practice,
as parameter sets with invalid ids were already filtered out during
reading.
Found via PVS-Studio (see ticket #8156).
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec/cbs_h2645.c')
| -rw-r--r-- | libavcodec/cbs_h2645.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 2dc261f7a5..5dd371153a 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -748,7 +748,7 @@ static int cbs_h26 ## h26n ## _replace_ ## ps_var(CodedBitstreamContext *ctx, \ CodedBitstreamH26 ## h26n ## Context *priv = ctx->priv_data; \ H26 ## h26n ## Raw ## ps_name *ps_var = unit->content; \ unsigned int id = ps_var->id_element; \ - if (id > FF_ARRAY_ELEMS(priv->ps_var)) { \ + if (id >= FF_ARRAY_ELEMS(priv->ps_var)) { \ av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid " #ps_name \ " id : %d.\n", id); \ return AVERROR_INVALIDDATA; \ |