commit 3816461c5177ccaea6a8306facd831c9aeb6fa85
author Krishna CR <krishna.cr@ittiam.com> Wed Jul 03 16:16:36 2019 +0530
committer Christopher Dombroski <cdombroski@google.com> Tue Dec 17 18:33:40 2019 +0000
tree e58f68384cd682fe62c24717e89936356164bcad
parent 592919b44578c56c549b58d432da193fcfd73532

[RESTRICT AUTOMERGE]: CTS test for Android Security b/64380237

Bug: 64380237
Bug: 72322954
Test: Ran new testcase on android-7.1.2_r2 with/without patch

Change-Id: Ie0683795f1f3d5aa2cfa89e8e11d19a5bc02e07e
(cherry picked from commit 7bfc2401806fa793bc56cc6f63c647a70b993db2)
(cherry picked from commit c88d377c707d9e339477cccf28f92fa34ab7a0a7)
(cherry picked from commit e74f8675eb9d566450f7fcbf468bae8ff335e960)

tests/tests/security/res/raw/cve_2017_13204_avc.mp4

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

tests/tests/security/res/raw/cve_2017_13204_framelen.mp4

diff --git a/tests/tests/security/res/raw/cve_2017_13204_framelen.mp4 b/tests/tests/security/res/raw/cve_2017_13204_framelen.mp4
new file mode 100644
index 0000000..5fc9458
--- /dev/null
+++ b/tests/tests/security/res/raw/cve_2017_13204_framelen.mp4
@@ -0,0 +1,98 @@
+22
+130
+83
+102
+85
+97
+73
+86
+79
+80
+69
+80
+78
+82
+81
+77
+65
+85
+83
+91
+72
+88
+74
+87
+72
+66
+66
+77
+74
+94
+66
+59
+59
+70
+64
+76
+59
+88
+59
+83
+75
+72
+72
+92
+83
+77
+52
+66
+57
+57
+58
+91
+69
+86
+67
+63
+68
+89
+73
+72
+69
+58
+65
+79
+82
+0
+239
+189
+168
+151
+137
+142
+156
+127
+149
+157
+152
+151
+113
+133
+158
+104
+114
+138
+144
+147
+126
+157
+132
+107
+100
+165
+154
+112
+164
+131
+111
+143
\ No newline at end of file

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 7cc3fe6..4402b4d 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -1116,6 +1116,11 @@
         doStagefrightTest(R.raw.cve_2019_2334);
     }
 
+    public void testStagefright_cve_2017_13204() throws Exception {
+        int[] frameSizes = getFrameSizes(R.raw.cve_2017_13204_framelen);
+        doStagefrightTestRawBlob(R.raw.cve_2017_13204_avc, "video/avc", 16, 16, frameSizes);
+    }
+
     @SecurityTest(minPatchLevel = "2018-03")
     public void testStagefright_cve_2017_17773() throws Exception {
         doStagefrightTest(R.raw.cve_2017_17773);