[FFmpeg-cvslog] avcodec/cbs_h2645: Fix leak of SPS VUI extension data
Andreas Rheinhardt
git at videolan.org
Sat Nov 4 03:25:54 EET 2023
ffmpeg | branch: release/6.1 | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Oct 23 17:16:22 2023 +0200| [868aa88d83c85a0f0ec56e9ae353e4b39e90e00a] | committer: Andreas Rheinhardt
avcodec/cbs_h2645: Fix leak of SPS VUI extension data
Fixes: VUI extension leak
Fixes: 63004/clusterfuzz-testcase-minimized-ffmpeg_BSF_VVC_METADATA_fuzzer-4928832253329408
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
(cherry picked from commit 3f890fbfd9014843c51408c8f7ab3ba4aef7d354)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=868aa88d83c85a0f0ec56e9ae353e4b39e90e00a
---
libavcodec/cbs_h2645.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c
index 470f60b95f..c48a06b241 100644
--- a/libavcodec/cbs_h2645.c
+++ b/libavcodec/cbs_h2645.c
@@ -1989,7 +1989,17 @@ static const CodedBitstreamUnitTypeDescriptor cbs_h266_unit_types[] = {
CBS_UNIT_TYPE_INTERNAL_REF(VVC_DCI_NUT, H266RawDCI, extension_data.data),
CBS_UNIT_TYPE_INTERNAL_REF(VVC_OPI_NUT, H266RawOPI, extension_data.data),
CBS_UNIT_TYPE_INTERNAL_REF(VVC_VPS_NUT, H266RawVPS, extension_data.data),
- CBS_UNIT_TYPE_INTERNAL_REF(VVC_SPS_NUT, H266RawSPS, extension_data.data),
+ {
+ .nb_unit_types = 1,
+ .unit_type.list[0] = VVC_SPS_NUT,
+ .content_type = CBS_CONTENT_TYPE_INTERNAL_REFS,
+ .content_size = sizeof(H266RawSPS),
+ .type.ref = {
+ .nb_offsets = 2,
+ .offsets = { offsetof(H266RawSPS, extension_data.data),
+ offsetof(H266RawSPS, vui.extension_data.data) }
+ },
+ },
CBS_UNIT_TYPE_INTERNAL_REF(VVC_PPS_NUT, H266RawPPS, extension_data.data),
CBS_UNIT_TYPE_INTERNAL_REF(VVC_PREFIX_APS_NUT, H266RawAPS, extension_data.data),
CBS_UNIT_TYPE_INTERNAL_REF(VVC_SUFFIX_APS_NUT, H266RawAPS, extension_data.data),
More information about the ffmpeg-cvslog
mailing list