diff options
| author | James Almer <[email protected]> | 2020-06-11 13:06:10 -0300 |
|---|---|---|
| committer | James Almer <[email protected]> | 2020-06-14 16:44:57 -0300 |
| commit | e6ab99f324b4b2bbb76afc9cd5463ce653ace72e (patch) | |
| tree | 7339b10e4808f258c85a2214d0197261ee385f91 | |
| parent | cdf88b5a0cb072b8a0319c466046fe410fe8341a (diff) | |
avcodec/cbs_h2645: abort when written inferred values don't match
If this happens, it's a sign of parsing issues earlier in the process, or
misuse by the calling module.
Prevents writing invalid bitstreams.
Reviewed-by: Michael Niedermayer <[email protected]>
Signed-off-by: James Almer <[email protected]>
(cherry picked from commit ef13fafe229a86480305fbb05e83208102ea962f)
| -rw-r--r-- | libavcodec/cbs_h2645.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index b432921ecc..64fe2c1b9b 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -408,10 +408,11 @@ static int cbs_h2645_read_more_rbsp_data(GetBitContext *gbc) #define infer(name, value) do { \ if (current->name != (value)) { \ - av_log(ctx->log_ctx, AV_LOG_WARNING, "Warning: " \ + av_log(ctx->log_ctx, AV_LOG_ERROR, \ "%s does not match inferred value: " \ "%"PRId64", but should be %"PRId64".\n", \ #name, (int64_t)current->name, (int64_t)(value)); \ + return AVERROR_INVALIDDATA; \ } \ } while (0) |