apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-14 04:54:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/diracdec: Propagate errors from dirac_get_arith_uint()

Browse Source 
Testcase: 11663/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5636791864918016

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2019-01-08 23:29:38 +01:00
parent 6dde65d7c0
commit 6ed3d0e01c
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/dirac_arith.h
View File

@@ -81,6 +81,7 @@ typedef struct {
const uint8_t *bytestream_end;
uint16_t contexts[DIRAC_CTX_COUNT];
int error;
} DiracArith;
extern const uint8_t ff_dirac_next_ctx[DIRAC_CTX_COUNT];
@@ -173,6 +174,7 @@ static inline int dirac_get_arith_uint(DiracArith *c, int follow_ctx, int data_c
while (!dirac_get_arith_bit(c, follow_ctx)) {
if (ret >= 0x40000000) {
av_log(NULL, AV_LOG_ERROR, "dirac_get_arith_uint overflow\n");
c->error = AVERROR_INVALIDDATA;
return -1;
}
ret <<= 1;