Browse Source

avcodec/diracdec: Propagate errors from dirac_get_arith_uint()

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>
tags/n4.2
Michael Niedermayer 6 years ago
parent
commit
6ed3d0e01c
3 changed files with 5 additions and 0 deletions
  1. +1
    -0
      libavcodec/dirac_arith.c
  2. +2
    -0
      libavcodec/dirac_arith.h
  3. +2
    -0
      libavcodec/diracdec.c

+ 1
- 0
libavcodec/dirac_arith.c View File

@@ -115,6 +115,7 @@ void ff_dirac_init_arith_decoder(DiracArith *c, GetBitContext *gb, int length)

c->counter = -16;
c->range = 0xffff;
c->error = 0;

for (i = 0; i < DIRAC_CTX_COUNT; i++)
c->contexts[i] = 0x8000;


+ 2
- 0
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;


+ 2
- 0
libavcodec/diracdec.c View File

@@ -537,6 +537,8 @@ static inline int codeblock(DiracContext *s, SubBand *b,
buf = b->ibuf + top * b->stride;
if (is_arith) {
for (y = top; y < bottom; y++) {
if (c->error)
return c->error;
for (x = left; x < right; x++) {
if (b->pshift) {
coeff_unpack_arith_10(c, qfactor, qoffset, b, (int32_t*)(buf)+x, x, y);


Loading…
Cancel
Save