Brad Bishop | 220d553 | 2018-08-14 00:59:39 +0100 | [diff] [blame] | 1 | From 018ca26dece618457dd13585cad52941193c4a25 Mon Sep 17 00:00:00 2001 |
| 2 | From: Thomas Daede <daede003@umn.edu> |
| 3 | Date: Wed, 9 May 2018 14:56:59 -0700 |
| 4 | Subject: [PATCH] CVE-2017-14160: fix bounds check on very low sample rates. |
| 5 | |
| 6 | CVE: CVE-2017-14160 |
| 7 | CVE: CVE-2018-10393 |
| 8 | Upstream-Status: Backport from https://gitlab.xiph.org/xiph/vorbis/commit/018ca26dece618457dd13585cad52941193c4a25 |
| 9 | |
| 10 | Signed-off-by: Thomas Daede <daede003@umn.edu> |
| 11 | Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> |
| 12 | --- |
| 13 | lib/psy.c | 3 ++- |
| 14 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/lib/psy.c b/lib/psy.c |
| 17 | index 422c6f1..1310123 100644 |
| 18 | --- a/lib/psy.c |
| 19 | +++ b/lib/psy.c |
| 20 | @@ -602,8 +602,9 @@ static void bark_noise_hybridmp(int n,const long *b, |
| 21 | for (i = 0, x = 0.f;; i++, x += 1.f) { |
| 22 | |
| 23 | lo = b[i] >> 16; |
| 24 | - if( lo>=0 ) break; |
| 25 | hi = b[i] & 0xffff; |
| 26 | + if( lo>=0 ) break; |
| 27 | + if( hi>=n ) break; |
| 28 | |
| 29 | tN = N[hi] + N[-lo]; |
| 30 | tX = X[hi] - X[-lo]; |
| 31 | -- |
| 32 | 2.7.4 |
| 33 | |