From 5e5701952535e22ad38d6735bbf4f1f92ce99ceb Mon Sep 17 00:00:00 2001
From: Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>
Date: Mon, 10 Sep 2018 16:39:30 +0200
Subject: Prevent out of bounds accesses in lppTransposer() and
 lppTransposerHBE()

Bug: 112160868
Test: see poc in bug
Change-Id: I6a2161865d9cb9b51dc37c09d6e3a4a8e5d11f86
(cherry picked from commit 4dad829df00932b89858b9833cf5dcded8d97c37)
---
 Android.bp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index 50cc092..c89a95c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -27,6 +27,9 @@ cc_library_static {
         misc_undefined:["unsigned-integer-overflow", "signed-integer-overflow"],
         cfi: true,
     },
+    shared_libs: [
+        "liblog",
+    ],
     export_include_dirs: [
         "libAACdec/include",
         "libAACenc/include",
-- 
cgit v1.2.3


From 26a9da724f4f6f14f3a863a56434b9e6ac360afa Mon Sep 17 00:00:00 2001
From: Ivan Lozano <ivanlozano@google.com>
Date: Tue, 11 Dec 2018 09:14:39 -0800
Subject: Enable bounds sanitization in libaac.

Enables the UBSan bounds sanitizer in libaac. This adds bounds checks
around array accesses when the array size is known at compile time.

Bug: 117221610
Test: make -j
Test: Device boots.
Change-Id: Ib820c7ec6ef6bcbf98d8526ed213c90ab29169c2
---
 Android.bp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index b322d07..73957f6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,7 +25,11 @@ cc_library_static {
         "-Wno-implicit-fallthrough",
     ],
     sanitize: {
-        misc_undefined:["unsigned-integer-overflow", "signed-integer-overflow"],
+        misc_undefined:[
+           "unsigned-integer-overflow",
+           "signed-integer-overflow",
+           "bounds",
+        ],
         cfi: true,
     },
     export_include_dirs: [
-- 
cgit v1.2.3