diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-09 13:25:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-14 17:56:21 +0200 |
| commit | 224b47f76dbe360a394ef85b9a3beaf11bb39c5f (patch) | |
| tree | dab58110a6590c38a3205444109370b8f3c77472 | |
| parent | b4cea069a5ad9c3a0fd0be25e6e71efe3cf09df2 (diff) | |
| download | ffmpeg-224b47f76dbe360a394ef85b9a3beaf11bb39c5f.tar.gz | |
avcodec/flacdec: Return error code instead of 0 for failures
Fixes: infinite loop
Fixes: 1418/clusterfuzz-testcase-minimized-5934472438480896
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3f5a68533decdfb4757207e8d7b5af06e1dcd197)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/flacdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index f73a32b461..581c73efc8 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -205,12 +205,12 @@ static int get_metadata_size(const uint8_t *buf, int buf_size) buf += 4; do { if (buf_end - buf < 4) - return 0; + return AVERROR_INVALIDDATA; flac_parse_block_header(buf, &metadata_last, NULL, &metadata_size); buf += 4; if (buf_end - buf < metadata_size) { /* need more data in order to read the complete header */ - return 0; + return AVERROR_INVALIDDATA; } buf += metadata_size; } while (!metadata_last); |