#include "avcodec.h"
#include "bsf.h"
+#include "bsf_internal.h"
#include "bytestream.h"
#include "hevc.h"
int nalu_type;
int is_irap, add_extradata, extra_size, prev_size;
+ if (bytestream2_get_bytes_left(&gb) < s->length_size) {
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
for (i = 0; i < s->length_size; i++)
nalu_size = (nalu_size << 8) | bytestream2_get_byte(&gb);
+ if (nalu_size < 2 || nalu_size > bytestream2_get_bytes_left(&gb)) {
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+
nalu_type = (bytestream2_peek_byte(&gb) >> 1) & 0x3f;
/* prepend extradata to IRAP frames */
extra_size = add_extradata * ctx->par_out->extradata_size;
got_irap |= is_irap;
- if (SIZE_MAX - nalu_size < 4 ||
- SIZE_MAX - 4 - nalu_size < extra_size) {
+ if (FFMIN(INT_MAX, SIZE_MAX) < 4ULL + nalu_size + extra_size) {
ret = AVERROR_INVALIDDATA;
goto fail;
}
if (ret < 0)
goto fail;
- if (add_extradata)
+ if (extra_size)
memcpy(out->data + prev_size, ctx->par_out->extradata, extra_size);
AV_WB32(out->data + prev_size + extra_size, 1);
bytestream2_get_buffer(&gb, out->data + prev_size + 4 + extra_size, nalu_size);