eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avcodec/vp9_parser: Check the input frame sizes for being consistent

Browse source 
Suggested-by: BBB
Fixed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-08-01 13:50:21 +02:00
parent fd2cde0234
commit 77b0f3f26d
1 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libavcodec/vp9_parser.c
View file

@ -28,6 +28,7 @@
typedef struct VP9ParseContext { typedef struct VP9ParseContext {
int n_frames; // 1-8 int n_frames; // 1-8
int size[8]; int size[8];
int marker_size;
int64_t pts; int64_t pts;
} VP9ParseContext; } VP9ParseContext;
@ -88,6 +89,21 @@ static int parse(AVCodecParserContext *ctx,
return 0; return 0;
} }
if (s->n_frames > 0) {
int i;
int size_sum = 0;
for (i = 0; i < s->n_frames ;i++)
size_sum += s->size[i];
size_sum += s->marker_size;
if (size_sum != size) {
av_log(avctx, AV_LOG_ERROR, "Inconsistent input frame sizes %d %d\n",
size_sum, size);
s->n_frames = 0;
}
}
if (s->n_frames > 0) { if (s->n_frames > 0) {
*out_data = data; *out_data = data;
*out_size = s->size[--s->n_frames]; *out_size = s->size[--s->n_frames];
@ -131,6 +147,7 @@ static int parse(AVCodecParserContext *ctx,
data += sz; \ data += sz; \
size -= sz; \ size -= sz; \
} \ } \
s->marker_size = size; \
parse_frame(ctx, *out_data, *out_size); \ parse_frame(ctx, *out_data, *out_size); \
return s->n_frames > 0 ? *out_size : full_size return s->n_frames > 0 ? *out_size : full_size