Merge "Workaround for verifying large APKs." into nyc-dev

am: 026cf53fe4

* commit '026cf53fe46a3da512088212f22a2989993eb963':
  Workaround for verifying large APKs.

core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java

@@ -84,8 +84,19 @@ public class ApkSignatureSchemeV2Verifier {
             if (fileSize > Integer.MAX_VALUE) {
                 return false;
             }
-            MappedByteBuffer apkContents =
+            MappedByteBuffer apkContents;
-                    apk.getChannel().map(FileChannel.MapMode.READ_ONLY, 0, fileSize);
+            try {
+                apkContents = apk.getChannel().map(FileChannel.MapMode.READ_ONLY, 0, fileSize);
+            } catch (IOException e) {
+                if (e.getCause() instanceof OutOfMemoryError) {
+                    // TODO: Remove this temporary workaround once verifying large APKs is
+                    // supported. Very large APKs cannot be memory-mapped. This verification code
+                    // needs to change to use a different approach for verifying such APKs.
+                    return false; // Pretend that this APK does not have a v2 signature.
+                } else {
+                    throw new IOException("Failed to memory-map APK", e);
+                }
+            }
             // ZipUtils and APK Signature Scheme v2 verifier expect little-endian byte order.
             apkContents.order(ByteOrder.LITTLE_ENDIAN);
 
@@ -134,11 +145,26 @@ public class ApkSignatureSchemeV2Verifier {
         if (fileSize > Integer.MAX_VALUE) {
             throw new IOException("File too large: " + apk.length() + " bytes");
         }
-        MappedByteBuffer apkContents =
+        MappedByteBuffer apkContents;
-                apk.getChannel().map(FileChannel.MapMode.READ_ONLY, 0, fileSize);
+        try {
-        // Attempt to preload the contents into memory for faster overall verification (v2 and
+            apkContents = apk.getChannel().map(FileChannel.MapMode.READ_ONLY, 0, fileSize);
-        // older) at the expense of somewhat increased latency for rejecting malformed APKs.
+            // Attempt to preload the contents into memory for faster overall verification (v2 and
-        apkContents.load();
+            // older) at the expense of somewhat increased latency for rejecting malformed APKs.
+            apkContents.load();
+        } catch (IOException e) {
+            if (e.getCause() instanceof OutOfMemoryError) {
+                // TODO: Remove this temporary workaround once verifying large APKs is supported.
+                // Very large APKs cannot be memory-mapped. This verification code needs to change
+                // to use a different approach for verifying such APKs.
+                // This workaround pretends that this APK does not have a v2 signature. This works
+                // fine provided the APK is not actually v2-signed. If the APK is v2 signed, v2
+                // signature stripping protection inside v1 signature verification code will reject
+                // this APK.
+                throw new SignatureNotFoundException("Failed to memory-map APK", e);
+            } else {
+                throw new IOException("Failed to memory-map APK", e);
+            }
+        }
         return verify(apkContents);
     }