diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-12 00:03:50 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-14 01:52:19 +0300 |
| commit | bbe27890ff7e31e74d024a17123cb073720f2486 (patch) | |
| tree | 1b384761fd24314d2d0826f1081c9e3912369f36 /libavcodec/cbs_av1.h | |
| parent | e52070e89c755bffe08ecb9d9ea6be73ca1509cd (diff) | |
avcodec/cbs_av1_syntax_template: Check num_y_points
"It is a requirement of bitstream conformance that num_y_points is less than or equal to 14."
Fixes: index 24 out of bounds for type 'uint8_t [24]'
Fixes: 19282/clusterfuzz-testcase-minimized-ffmpeg_BSF_AV1_FRAME_MERGE_fuzzer-5747424845103104
Note, also needs a23dd33606d5
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/cbs_av1.h')
| -rw-r--r-- | libavcodec/cbs_av1.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h index 643e76793f..5466151f73 100644 --- a/libavcodec/cbs_av1.h +++ b/libavcodec/cbs_av1.h @@ -256,8 +256,8 @@ typedef struct AV1RawFrameHeader { uint8_t update_grain; uint8_t film_grain_params_ref_idx; uint8_t num_y_points; - uint8_t point_y_value[16]; - uint8_t point_y_scaling[16]; + uint8_t point_y_value[14]; + uint8_t point_y_scaling[14]; uint8_t chroma_scaling_from_luma; uint8_t num_cb_points; uint8_t point_cb_value[16]; |