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
Unified · Split
| @@ -1989,7 +1989,17 @@ static const CodedBitstreamUnitTypeDescriptor cbs_h266_unit_types[] = { · 1988 unmodified lines | ||
| 1989 | 1989 | CBS_UNIT_TYPE_INTERNAL_REF(VVC_DCI_NUT, H266RawDCI, extension_data.data), |
| 1990 | 1990 | CBS_UNIT_TYPE_INTERNAL_REF(VVC_OPI_NUT, H266RawOPI, extension_data.data), |
| 1991 | 1991 | CBS_UNIT_TYPE_INTERNAL_REF(VVC_VPS_NUT, H266RawVPS, extension_data.data), |
| 1992 | − CBS_UNIT_TYPE_INTERNAL_REF(VVC_SPS_NUT, H266RawSPS, extension_data.data), | |
| 1992 | + { | |
| 1993 | + .nb_unit_types = 1, | |
| 1994 | + .unit_type.list[0] = VVC_SPS_NUT, | |
| 1995 | + .content_type = CBS_CONTENT_TYPE_INTERNAL_REFS, | |
| 1996 | + .content_size = sizeof(H266RawSPS), | |
| 1997 | + .type.ref = { | |
| 1998 | + .nb_offsets = 2, | |
| 1999 | + .offsets = { offsetof(H266RawSPS, extension_data.data), | |
| 2000 | + offsetof(H266RawSPS, vui.extension_data.data) } | |
| 2001 | + }, | |
| 2002 | + }, | |
| 1993 | 2003 | CBS_UNIT_TYPE_INTERNAL_REF(VVC_PPS_NUT, H266RawPPS, extension_data.data), |
| 1994 | 2004 | CBS_UNIT_TYPE_INTERNAL_REF(VVC_PREFIX_APS_NUT, H266RawAPS, extension_data.data), |
| 1995 | 2005 | CBS_UNIT_TYPE_INTERNAL_REF(VVC_SUFFIX_APS_NUT, H266RawAPS, extension_data.data), |