commit | 0ec5338fec5ab4f39842066fb64534a155b1e314 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Thu May 14 22:42:48 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 14 22:42:49 2015 +0000 |
tree | 9f0208a6daf44705651b8f23e1418e12a8fe640e | |
parent | 52193fa3472b79873e73044ce02e1c0a67c85043 [diff] | |
parent | c7fdab4f4832fbe4ab9655f91dbed6b3878fe4b7 [diff] |
Merge "Fix vorbis decoder crash due to out of bounds memory access" into mnc-dev
diff --git a/Tremolo/floor1.c b/Tremolo/floor1.c index a2a035b..4a4937d 100644 --- a/Tremolo/floor1.c +++ b/Tremolo/floor1.c
@@ -232,8 +232,9 @@ if(n>x1)n=x1; n -= x0; - if (n <= 0) + if (n <= 0 || y0 < 0 || y0 > 255 || y1 < 0 || y1 > 255) { return; + } dy=y1-y0; adx=x1-x0; ady=abs(dy);