summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2017-10-10 15:28:45 -0400
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-11-28 03:25:19 +0000
commit7ab52a64f65e6995ba43dc4876ed263ba44daeee (patch)
treef3548cee4773588e8f4ca9f6a2adb6b8cfc7422c
parent8da997e446a0941dd83f11c77a8f78b84b0df5a7 (diff)
downloadcts-7ab52a64f65e6995ba43dc4876ed263ba44daeee.tar.gz
Test that createBitmap(65535,65535) throws OOME
Bug: 33846679 Test: this A Java GIF decoder (e.g. FrameSequence) may attempt to create a large Bitmap (up to the maximum GIF size of 65535 x 65535). Test that we throw OOME, which corresponds to the old code when Bitmap pixel memory was allocated from Java/JNI (instead of creating a null Bitmap and then throwing a NullPointerException inside createBitmap). Merged-In: I6ab6cb7a3b3151641a9f9b02b0bfc484e0a4524b Change-Id: I6ab6cb7a3b3151641a9f9b02b0bfc484e0a4524b (cherry picked from commit 929b43e46db05edd4d0d227bddbdcf9df4fb0268) (cherry picked from commit a59b3ee79429f37033bb543bbc6270bc7a1e22e9)
-rw-r--r--tests/tests/security/src/android/security/cts/BitmapTest.java41
1 files changed, 41 insertions, 0 deletions
diff --git a/tests/tests/security/src/android/security/cts/BitmapTest.java b/tests/tests/security/src/android/security/cts/BitmapTest.java
new file mode 100644
index 00000000000..6253f0a35ca
--- /dev/null
+++ b/tests/tests/security/src/android/security/cts/BitmapTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.security.cts;
+
+import org.junit.runner.RunWith;
+import org.junit.Test;
+
+import android.graphics.Bitmap;
+import android.platform.test.annotations.SecurityTest;
+import android.support.test.runner.AndroidJUnit4;
+
+@SecurityTest
+@RunWith(AndroidJUnit4.class)
+public class BitmapTest {
+ /**
+ * Test Bitmap.createBitmap properly throws OOME on large inputs.
+ *
+ * A prior change in behavior resulted in throwing an NPE instead.
+ * OOME is more appropriate.
+ */
+ @Test(expected=OutOfMemoryError.class)
+ public void test_33846679() {
+ // This size is based on the max size possible in a GIF file,
+ // which might be passed to createBitmap from a Java decoder.
+ Bitmap.createBitmap(65535, 65535, Bitmap.Config.ARGB_8888);
+ }
+}