git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ed4c6ce
)
avcodec/atrac9dec: Check conditions before apply_band_extension() to avoid out of...
author
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 15 Jun 2019 19:34:18 +0000
(21:34 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Fri, 19 Jul 2019 10:59:50 +0000
(12:59 +0200)
Fixes: global-buffer-overflow
Fixes: 15247/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ATRAC9_fuzzer-
5671602181636096
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/atrac9dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/atrac9dec.c
b/libavcodec/atrac9dec.c
index
4d490da
..
2e23ea4
100644
(file)
--- a/
libavcodec/atrac9dec.c
+++ b/
libavcodec/atrac9dec.c
@@
-539,9
+539,6
@@
static inline void apply_band_extension(ATRAC9Context *s, ATRAC9BlockData *b,
at9_q_unit_to_coeff_idx[g_units[3]],
};
- if (!b->has_band_ext || !b->has_band_ext_data)
- return;
-
for (int ch = 0; ch <= stereo; ch++) {
ATRAC9ChannelData *c = &b->channel[ch];
@@
-751,7
+748,9
@@
static int atrac9_decode_block(ATRAC9Context *s, GetBitContext *gb,
apply_intensity_stereo(s, b, stereo);
apply_scalefactors (s, b, stereo);
- apply_band_extension (s, b, stereo);
+
+ if (b->has_band_ext && b->has_band_ext_data)
+ apply_band_extension (s, b, stereo);
imdct:
for (int i = 0; i <= stereo; i++) {