Prevent out of memory errors when sniffing a media type (#400)

readium · Oct 2, 2023 · e66cf65 · e66cf65
1 parent 9580cdd
commit e66cf65
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/readium/shared/src/main/java/org/readium/r2/shared/resource/DefaultArchiveFactory.kt b/readium/shared/src/main/java/org/readium/r2/shared/resource/DefaultArchiveFactory.kt
@@ -15,6 +15,9 @@ import org.readium.r2.shared.util.MessageError
 import org.readium.r2.shared.util.Try
 import org.readium.r2.shared.util.mediatype.MediaTypeRetriever
 
+/**
+ * An [ArchiveFactory] to open local ZIP files with Java's [ZipFile].
+ */
 public class DefaultArchiveFactory(
     private val mediaTypeRetriever: MediaTypeRetriever
 ) : ArchiveFactory {
@@ -28,7 +31,7 @@ public class DefaultArchiveFactory(
             ?.let { open(it) }
             ?: Try.Failure(
                 ArchiveFactory.Error.FormatNotSupported(
-                    MessageError("Resource not supported because file cannot be directly access.")
+                    MessageError("Resource not supported because file cannot be directly accessed.")
                 )
             )
     }

diff --git a/readium/shared/src/main/java/org/readium/r2/shared/resource/MediaTypeExt.kt b/readium/shared/src/main/java/org/readium/r2/shared/resource/MediaTypeExt.kt
@@ -1,6 +1,7 @@
 package org.readium.r2.shared.resource
 
 import org.readium.r2.shared.util.Url
+import org.readium.r2.shared.util.getOrDefault
 import org.readium.r2.shared.util.mediatype.ContainerMediaTypeSnifferContent
 import org.readium.r2.shared.util.mediatype.ResourceMediaTypeSnifferContent
 
@@ -9,7 +10,7 @@ public class ResourceMediaTypeSnifferContent(
 ) : ResourceMediaTypeSnifferContent {
 
     override suspend fun read(range: LongRange?): ByteArray? =
-        resource.read(range).getOrNull()
+        resource.safeRead(range)
 }
 
 public class ContainerMediaTypeSnifferContent(
@@ -21,6 +22,18 @@ public class ContainerMediaTypeSnifferContent(
 
     override suspend fun read(path: String, range: LongRange?): ByteArray? =
         Url.fromDecodedPath(path)?.let { url ->
-            container.get(url).read(range).getOrNull()
+            container.get(url).safeRead(range)
         }
 }
+
+private suspend fun Resource.safeRead(range: LongRange?): ByteArray? {
+    try {
+        // We only read files smaller than 5MB to avoid an [OutOfMemoryError].
+        if (range == null && length().getOrDefault(0) > 5 * 1000 * 1000) {
+            return null
+        }
+        return read(range).getOrNull()
+    } catch (e: OutOfMemoryError) {
+        return null
+    }
+}
diff --git a/...um/shared/src/main/java/org/readium/r2/shared/util/archive/channel/ChannelZipContainer.kt b/...um/shared/src/main/java/org/readium/r2/shared/util/archive/channel/ChannelZipContainer.kt
@@ -170,7 +170,8 @@ internal class ChannelZipContainer(
 }
 
 /**
- * An [ArchiveFactory] able to open a ZIP archive served through an HTTP server.
+ * An [ArchiveFactory] able to open a ZIP archive served through a stream (e.g. HTTP server,
+ * content URI, etc.).
  */
 public class ChannelZipArchiveFactory(
     private val mediaTypeRetriever: MediaTypeRetriever