commit a752bc0788f156a17d6b3d341c92c0c339d4ab24
author Ayushi Khopkar <ayushi.khopkar@ittiam.com> Mon Dec 30 18:29:59 2019 +0530
committer Stacie Mashnitskaya <mashnitskaya@google.com> Wed Oct 07 18:03:05 2020 -0700
tree e5f0f4337d6cdc257d8084caa2dc87d69193b62f
parent cad5fb600c4775c10cb46b110f3466edc340d03c

CTS test for Android Security b/140692129

Bug: 140692129
Bug: 143367818
Test: Ran the new testcase on android-10.0.0_r1 to test with/without patch

Change-Id: I4b37878c1d81951355b2556166927caeaeb30ef4

tests/tests/security/res/raw/cve_2019_2223_framelen.mp4

diff --git a/tests/tests/security/res/raw/cve_2019_2223_framelen.mp4 b/tests/tests/security/res/raw/cve_2019_2223_framelen.mp4
new file mode 100644
index 0000000..a1c3cfc
--- /dev/null
+++ b/tests/tests/security/res/raw/cve_2019_2223_framelen.mp4
@@ -0,0 +1,5 @@
+29
+12
+9
+23
+73

tests/tests/security/res/raw/cve_2019_2223_hevc.mp4

diff --git a/tests/tests/security/res/raw/cve_2019_2223_hevc.mp4 b/tests/tests/security/res/raw/cve_2019_2223_hevc.mp4
new file mode 100644
index 0000000..f9d5dbc
--- /dev/null
+++ b/tests/tests/security/res/raw/cve_2019_2223_hevc.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 aa903b3..60f72c4 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -1685,6 +1685,13 @@
      ***********************************************************/
 
     @Test
+    @SecurityTest(minPatchLevel = "2019-12")
+    public void testStagefright_cve_2019_2223() throws Exception {
+        int[] frameSizes = getFrameSizes(R.raw.cve_2019_2223_framelen);
+        doStagefrightTestRawBlob(R.raw.cve_2019_2223_hevc, "video/hevc", 320, 240, frameSizes);
+    }
+
+    @Test
     @SecurityTest(minPatchLevel = "2019-03")
     public void testStagefright_cve_2019_1989() throws Exception {
         Object obj[] = getFrameInfo(R.raw.cve_2019_1989_info);