commit b6bb33e71a1567bda458081b204c833c6cabb44b
author Nick Kralevich <nnk@google.com> Wed Mar 27 06:20:51 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Mar 27 06:20:51 2019 -0700
tree 3e5b27be8e5e02490d87c54dfc69d78ee59e07ef
parent cdbd2b65408cb29d1bcadb854b4a411c13060187
parent 74c2948d5190085131abec74210d4878a6909b1e

Merge "libziparchive: add integer checks" am: 80e72443d0
am: d25aebd7b7

Change-Id: I2895fa552d2390a133e9e345f1acecf9be9517c7

libziparchive/Android.bp

diff --git a/libziparchive/Android.bp b/libziparchive/Android.bp
index 9538bba..bc1543b 100644
--- a/libziparchive/Android.bp
+++ b/libziparchive/Android.bp
@@ -38,6 +38,19 @@
             ],
         },
     },
+    sanitize: {
+        misc_undefined: [
+            "signed-integer-overflow",
+            "unsigned-integer-overflow",
+            "shift",
+            "integer-divide-by-zero",
+            "implicit-signed-integer-truncation",
+            // TODO: Fix crash when we enable this option
+            // "implicit-unsigned-integer-truncation",
+            // TODO: not tested yet.
+            // "implicit-integer-sign-change",
+        ],
+    },
 }
 
 cc_defaults {