aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2023-07-25 02:13:10 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2023-07-25 23:17:29 +0200
commit0ba719f726632d73592311615087a0d64aa2fb60 (patch)
tree636b0c8a00f837b7dd604a177f17209a95c7b8f3
parentac3e6b74bdd6959ce4411e78161b2f06d0926c43 (diff)
downloadffmpeg-0ba719f726632d73592311615087a0d64aa2fb60.tar.gz
avcodec/cbs_h2645: Avoid an unchecked bytesteram read
The unchecked read caused the 2nd subsequent tell call to move backward resulting in a negative length Fixes: assertion failure Fixes: 60276/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5434126636023808 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/cbs_h2645.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c
index 34c5d1d372..21c8bc76d5 100644
--- a/libavcodec/cbs_h2645.c
+++ b/libavcodec/cbs_h2645.c
@@ -695,7 +695,7 @@ static int cbs_h2645_split_fragment(CodedBitstreamContext *ctx,
int nal_unit_type = bytestream2_get_byte(&gbc) & 0x1f;
unsigned int num_nalus = 1;
if(nal_unit_type != VVC_DCI_NUT && nal_unit_type != VVC_OPI_NUT)
- num_nalus = bytestream2_get_be16u(&gbc);
+ num_nalus = bytestream2_get_be16(&gbc);
start = bytestream2_tell(&gbc);
for(i = 0; i < num_nalus; i++) {