commit f597c3e908f7673e6391e4a05675625321309802
author Krishna CR <krishna.cr@ittiam.com> Fri Jul 05 17:05:53 2019 +0530
committer Matt Fitzpatrick <mafitzpatrick@google.com> Thu Aug 15 18:10:33 2019 -0700
tree 5a8e1975b72dcc5e4891403d08b1e93aec24e099
parent 3c3dca013339087ee89238aa898d42471228df74

CTS test for Android Security b/33129467

Bug: 33129467
Bug: 72389094
Test: Ran the new testcase on android-7.1.1_r14 with/without patch

Change-Id: I4a97f7de4d8ebd0b827f65edc5d6539bf2e6cf7f
(cherry picked from commit 3daaed8467bd699a9d3189473ffea843a41dfcbb)

tests/tests/security/res/raw/cve_2017_0640_avc.mp4

diff --git a/tests/tests/security/res/raw/cve_2017_0640_avc.mp4 b/tests/tests/security/res/raw/cve_2017_0640_avc.mp4
new file mode 100644
index 0000000..71ed5dd
--- /dev/null
+++ b/tests/tests/security/res/raw/cve_2017_0640_avc.mp4
Binary files differ

tests/tests/security/src/android/security/cts/StagefrightTest.java

diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index 5833016..3e2297b 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -802,6 +802,13 @@
         doStagefrightTest(R.raw.bug_36279112);
     }
 
+    @SecurityTest(minPatchLevel = "2017-06")
+    public void testStagefright_cve_2017_0640() throws Exception {
+        int[] frameSizes = {21, 4};
+        doStagefrightTestRawBlob(R.raw.cve_2017_0640_avc, "video/avc", 640, 480,
+                frameSizes);
+    }
+
     @SecurityTest(minPatchLevel = "2017-08")
     public void testBug_37203196() throws Exception {
         int[] frameSizes = getFrameSizes(R.raw.bug_37203196_framelen);