| Message ID | 20170521184616.13847-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | fe8c9420dd5bbc7a0c545e479da9118bcf311dd2 |
| Headers | show |
On Sun, May 21, 2017 at 08:46:16PM +0200, Michael Niedermayer wrote: > Fixes: runtime error: left shift of negative value -67108864 > Fixes: 1738/clusterfuzz-testcase-minimized-6734814327603200 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/aacps.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) applied [...]
diff --git a/libavcodec/aacps.c b/libavcodec/aacps.c index 48b595adbd..31e072dd49 100644 --- a/libavcodec/aacps.c +++ b/libavcodec/aacps.c @@ -196,8 +196,13 @@ int AAC_RENAME(ff_ps_read_data)(AVCodecContext *avctx, GetBitContext *gb_host, P ps->border_position[0] = -1; if (ps->frame_class) { - for (e = 1; e <= ps->num_env; e++) + for (e = 1; e <= ps->num_env; e++) { ps->border_position[e] = get_bits(gb, 5); + if (ps->border_position[e] < ps->border_position[e-1]) { + av_log(avctx, AV_LOG_ERROR, "border_position non monotone.\n"); + goto err; + } + } } else for (e = 1; e <= ps->num_env; e++) ps->border_position[e] = (e * numQMFSlots >> ff_log2_tab[ps->num_env]) - 1;
Fixes: runtime error: left shift of negative value -67108864 Fixes: 1738/clusterfuzz-testcase-minimized-6734814327603200 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/aacps.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)