commit b779811af0b60f37c43a02277ea6f58325113411
author Krishna C R <krishna.cr@ittiam.com> Mon Jul 08 15:17:32 2019 +0530
committer Matt Fitzpatrick <mafitzpatrick@google.com> Thu Aug 15 18:37:42 2019 -0700
tree a8f9390bdb5cd7db31e41aa08c755c942e40013c
parent 3c3dca013339087ee89238aa898d42471228df74

[RESTRICT AUTOMERGE] CTS test for Android Security b/65034175

Bug: 65034175
Bug: 72323109
Test: Ran the new testcase on android-8.1.0_r1 with/without patch

Change-Id: Iad77c9967a0cd6f34122e0e1a058d172a4b22b65
(cherry picked from commit 3c4aca335bccbb5d2907779f150b8c479a82795a)

hostsidetests/securitybulletin/res/cve_2017_13187.hevc

diff --git a/hostsidetests/securitybulletin/res/cve_2017_13187.hevc b/hostsidetests/securitybulletin/res/cve_2017_13187.hevc
new file mode 100644
index 0000000..287bd95
--- /dev/null
+++ b/hostsidetests/securitybulletin/res/cve_2017_13187.hevc
Binary files differ

hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java

diff --git a/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java b/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java
index 80e2a01..b00fec3 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java
@@ -42,6 +42,14 @@
     below this comment, before any existing test methods
     ***********************************************************/
 
+    @SecurityTest(minPatchLevel = "2018-01")
+    public void testPocCVE_2017_13187() throws Exception {
+        String inputFiles[] = {"cve_2017_13187.hevc"};
+        runHevcDecodeTest(inputFiles, "--input " + TMP_FILE_PATH
+                        + "cve_2017_13187.hevc --num_frames -1 --num_cores 4",
+                getDevice(), null);
+    }
+
     @SecurityTest
     public void testPocBug_73965867() throws Exception {
         String inputFiles[] = {"bug_73965867.hevc"};