diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-02-17 04:20:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-02-17 20:31:39 +0100 |
| commit | 1be49cee34eb588d70c2bf4c46dc23539fd71b53 (patch) | |
| tree | 88f6cccdf660923587352d26620d1c9795f42018 /libavcodec/h264_parser.c | |
| parent | 01370b31aced784593f2bc0836f4ba6fd8e7f6b3 (diff) | |
| download | ffmpeg-1be49cee34eb588d70c2bf4c46dc23539fd71b53.tar.gz | |
avcodec/h264: Increase field_poc to 64bit in ff_h264_init_poc() to detect overflows
Fixes: Integer overflow
Fixes: 5746/clusterfuzz-testcase-minimized-6270097623613440
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/h264_parser.c')
| -rw-r--r-- | libavcodec/h264_parser.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 65d9d44b50..1a9840a62c 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -449,8 +449,10 @@ static inline int parse_nal_units(AVCodecParserContext *s, /* Decode POC of this picture. * The prev_ values needed for decoding POC of the next picture are not set here. */ field_poc[0] = field_poc[1] = INT_MAX; - ff_h264_init_poc(field_poc, &s->output_picture_number, sps, + ret = ff_h264_init_poc(field_poc, &s->output_picture_number, sps, &p->poc, p->picture_structure, nal.ref_idc); + if (ret < 0) + goto fail; /* Continue parsing to check if MMCO_RESET is present. * FIXME: MMCO_RESET could appear in non-first slice. |