blob: b7603c3b13d24f60e69ca5c70dd0480c7659b873 [file] [log] [blame]
Brad Bishop220d5532018-08-14 00:59:39 +01001From 018ca26dece618457dd13585cad52941193c4a25 Mon Sep 17 00:00:00 2001
2From: Thomas Daede <daede003@umn.edu>
3Date: Wed, 9 May 2018 14:56:59 -0700
4Subject: [PATCH] CVE-2017-14160: fix bounds check on very low sample rates.
5
Brad Bishop220d5532018-08-14 00:59:39 +01006---
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08007CVE: CVE-2017-14160 CVE-2018-10393
8
9Upstream-Status: Backport [gitlab.com/Xiph.Org/Vorbis/Commits/018ca26d...]
10
11Signed-off-by: Joe Slater <joe.slater@windriver.com>
12---
13---
14 lib/psy.c | 3 ++-
Brad Bishop220d5532018-08-14 00:59:39 +010015 1 file changed, 2 insertions(+), 1 deletion(-)
16
17diff --git a/lib/psy.c b/lib/psy.c
18index 422c6f1..1310123 100644
19--- a/lib/psy.c
20+++ b/lib/psy.c
21@@ -602,8 +602,9 @@ static void bark_noise_hybridmp(int n,const long *b,
22 for (i = 0, x = 0.f;; i++, x += 1.f) {
23
24 lo = b[i] >> 16;
25- if( lo>=0 ) break;
26 hi = b[i] & 0xffff;
27+ if( lo>=0 ) break;
28+ if( hi>=n ) break;
29
30 tN = N[hi] + N[-lo];
31 tX = X[hi] - X[-lo];
32--
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800331.7.9.5
Brad Bishop220d5532018-08-14 00:59:39 +010034