archive: Use memfd instead

app/src/main/cpp/archive.c

@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <syscall.h>
 #include <sys/mman.h>
 
 #include <jni.h>
@@ -103,6 +104,7 @@ JNIEXPORT jint JNICALL
 Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *_, jobject thiz, jint fd, jlong size) {
     archiveAddr = mmap64(0, size, PROT_READ, MAP_PRIVATE, fd, 0);
     if (archiveAddr == MAP_FAILED) {
+        archiveAddr = NULL;
         LOGE("%s%d", "mmap64 failed with errno ", errno);
         return 0;
     }
@@ -143,35 +145,27 @@ Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *_, jobject thiz, jint fd,
     return r;
 }
 
-typedef struct Memarea {
-    void *buffer;
-    long size;
-} Memarea;
-
-JNIEXPORT jlong JNICALL
-Java_com_hippo_UriArchiveAccessor_extracttoOutputStream(JNIEnv *_, jobject thiz, jint index) {
+JNIEXPORT jint JNICALL
+Java_com_hippo_UriArchiveAccessor_extractToMemfd(JNIEnv *_, jobject thiz, jint index) {
     struct archive_entry *entry;
     int ret;
     if (!arc || index < cur_index) {
         archive_alloc();
         cur_index = 0;
     }
-    Memarea *memarea = malloc(sizeof(Memarea));
+    int memfd = syscall(SYS_memfd_create, "ArchiveMemFD", 0);
     while (archive_read_next_header(arc, &entry) == ARCHIVE_OK) {
         if (!filename_is_playable_file(archive_entry_pathname(entry)))
             continue;
         if (cur_index++ == index) {
-            memarea->size = (long) archive_entry_size(entry);
-            memarea->buffer = malloc(memarea->size);
-            ret = archive_read_data(arc, memarea->buffer, memarea->size);
-            if (ret != memarea->size)
-                LOGE("%s", "No enough data read, WTF?");
+            ret = archive_read_data_into_fd(arc, memfd);
             if (ret < 0)
                 LOGE("%s%s", "Archive read failed:", archive_error_string(arc));
             break;
         }
     }
-    return (jlong) memarea;
+    lseek64(memfd, 0, SEEK_SET);
+    return memfd;
 }
 
 JNIEXPORT void JNICALL

app/src/main/cpp/image.c

@@ -19,8 +19,10 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <android/data_space.h>
+#include <android/fdsan.h>
 #include <android/imagedecoder.h>
 #include <android/log.h>
 
@@ -52,7 +54,6 @@ void image_onUnload() {
 
 typedef struct {
     AImageDecoder *decoder;
-    void *srcBuffer;
     size_t stride;
     int fd;
 } SOURCE;
@@ -72,7 +73,8 @@ static void recycleSource(SOURCE *src) {
     if (!src)
         return;
     AImageDecoder_delete(src->decoder);
-    free(src->srcBuffer);
+    if (!android_fdsan_get_owner_tag(src->fd))
+        close(src->fd);
     free(src);
 }
 
@@ -84,11 +86,6 @@ static void recycle(IMAGE *image) {
     free(image);
 }
 
-typedef struct Memarea {
-    void *buffer;
-    long size;
-} Memarea;
-
 bool copy_pixels(const void *src, int src_w, int src_h, int src_x, int src_y,
                  void *dst, int dst_w, int dst_h, int dst_x, int dst_y,
                  int width, int height) {
@@ -216,17 +213,6 @@ IMAGE *createFromFd(int fd) {
     return image;
 }
 
-IMAGE *createFromAddr(void *addr, long size) {
-    AImageDecoder *decoder;
-    AImageDecoder_createFromBuffer((const void *) addr, size, &decoder);
-    IMAGE *image = calloc(1, sizeof(IMAGE));
-    SOURCE *src = calloc(1, sizeof(SOURCE));
-    src->decoder = decoder;
-    src->srcBuffer = addr;
-    decodeCommon(image, src);
-    return image;
-}
-
 IMAGE *create(int32_t width, int32_t height, const void *data) {
     IMAGE *plain = calloc(1, sizeof(IMAGE));
     void *buffer = NULL;
@@ -356,14 +342,6 @@ Java_com_hippo_image_Image_nativeRecycle(JNIEnv *env, jclass clazz, jlong ptr) {
     recycle((IMAGE *) ptr);
 }
 
-JNIEXPORT jlong JNICALL
-Java_com_hippo_image_Image_nativeDecodeAddr(JNIEnv *env, jclass clazz, jlong addr) {
-    Memarea *memarea = (Memarea *) addr;
-    IMAGE *image = createFromAddr(memarea->buffer, memarea->size);
-    free(memarea);
-    return (jlong) image;
-}
-
 JNIEXPORT jint JNICALL
 Java_com_hippo_image_Image_nativeGetFormat(JNIEnv *env, jclass clazz, jlong native_ptr) {
     return ((IMAGE *) native_ptr)->isAnimated;

app/src/main/cpp/main.c

@@ -23,6 +23,8 @@
 #include <zlib.h>
 #include <nettle/config.h>
 
+#include <android/fdsan.h>
+
 #include "image.h"
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
@@ -36,6 +38,8 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
         return JNI_ERR;
     }
 
+    android_fdsan_set_error_level(ANDROID_FDSAN_ERROR_LEVEL_WARN_ONCE);
+
     return JNI_VERSION_1_6;
 }