mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-23 09:45:06 +02:00
h264: Skip odd NALs in extradata, prevent undefined behavior
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
4bee03034b
commit
4fecc3cf09
@ -1002,7 +1002,7 @@ static av_cold void common_init(H264Context *h)
|
|||||||
memset(h->pps.scaling_matrix8, 16, 2 * 64 * sizeof(uint8_t));
|
memset(h->pps.scaling_matrix8, 16, 2 * 64 * sizeof(uint8_t));
|
||||||
}
|
}
|
||||||
|
|
||||||
int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size)
|
static int ff_h264_decode_extradata_internal(H264Context *h, const uint8_t *buf, int size)
|
||||||
{
|
{
|
||||||
AVCodecContext *avctx = h->s.avctx;
|
AVCodecContext *avctx = h->s.avctx;
|
||||||
|
|
||||||
@ -1059,6 +1059,15 @@ int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size)
|
|||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
h->decoding_extradata = 1;
|
||||||
|
ret = ff_h264_decode_extradata_internal(h, buf, size);
|
||||||
|
h->decoding_extradata = 0;
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
av_cold int ff_h264_decode_init(AVCodecContext *avctx)
|
av_cold int ff_h264_decode_init(AVCodecContext *avctx)
|
||||||
{
|
{
|
||||||
H264Context *h = avctx->priv_data;
|
H264Context *h = avctx->priv_data;
|
||||||
@ -3849,6 +3858,20 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size)
|
|||||||
|
|
||||||
again:
|
again:
|
||||||
err = 0;
|
err = 0;
|
||||||
|
|
||||||
|
if (h->decoding_extradata) {
|
||||||
|
switch (hx->nal_unit_type) {
|
||||||
|
case NAL_IDR_SLICE:
|
||||||
|
case NAL_SLICE:
|
||||||
|
case NAL_DPA:
|
||||||
|
case NAL_DPB:
|
||||||
|
case NAL_DPC:
|
||||||
|
case NAL_AUXILIARY_SLICE:
|
||||||
|
av_log(h->s.avctx, AV_LOG_WARNING, "Ignoring NAL %d in global header\n", hx->nal_unit_type);
|
||||||
|
hx->nal_unit_type = NAL_FILLER_DATA;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
switch (hx->nal_unit_type) {
|
switch (hx->nal_unit_type) {
|
||||||
case NAL_IDR_SLICE:
|
case NAL_IDR_SLICE:
|
||||||
if (h->nal_unit_type != NAL_IDR_SLICE) {
|
if (h->nal_unit_type != NAL_IDR_SLICE) {
|
||||||
|
@ -447,6 +447,7 @@ typedef struct H264Context {
|
|||||||
int nal_unit_type;
|
int nal_unit_type;
|
||||||
uint8_t *rbsp_buffer[2];
|
uint8_t *rbsp_buffer[2];
|
||||||
unsigned int rbsp_buffer_size[2];
|
unsigned int rbsp_buffer_size[2];
|
||||||
|
int decoding_extradata;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Used to parse AVC variant of h264
|
* Used to parse AVC variant of h264
|
||||||
|
Loading…
Reference in New Issue
Block a user