Commit 4f804414 authored by Nuo Mi's avatar Nuo Mi

avcodec/hevc_mp4toannexb: more validations for nalu_len

For a corrupted stream, the value of nalu_len read from the extradata is not reliable.
We need to perform additional checks
parent f7a504a0
...@@ -65,9 +65,11 @@ static int hevc_extradata_to_annexb(AVBSFContext *ctx) ...@@ -65,9 +65,11 @@ static int hevc_extradata_to_annexb(AVBSFContext *ctx)
} }
for (j = 0; j < cnt; j++) { for (j = 0; j < cnt; j++) {
int nalu_len = bytestream2_get_be16(&gb); const int nalu_len = bytestream2_get_be16(&gb);
if (4 + AV_INPUT_BUFFER_PADDING_SIZE + nalu_len > SIZE_MAX - new_extradata_size) { if (!nalu_len ||
nalu_len > bytestream2_get_bytes_left(&gb) ||
4 + AV_INPUT_BUFFER_PADDING_SIZE + nalu_len > SIZE_MAX - new_extradata_size) {
ret = AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto fail; goto fail;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment