archive: Use memfd instead

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;