Merge remote-tracking branch 'upstream/main'

Author: bastimeyer

.github/workflows/build.yaml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Get git hash
         run: |
@@ -34,7 +34,7 @@ jobs:
           mkdir -p out
           (cd out && ../scripts/docker/build-with-docker.sh)
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: runtime-${{ matrix.appimage_arch }}
           path: out/*
@@ -48,9 +48,9 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - run: mkdir -p out
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           path: out
       - run: ./deploy.sh out/**/*

src/runtime/runtime.c

@@ -321,6 +321,11 @@ bool appimage_get_elf_section_offset_and_length(const char* fname, const char* s
 	data = mmap(NULL, map_size, PROT_READ, MAP_SHARED, fd, 0);
 	close(fd);
 
+	if (data == MAP_FAILED) {
+		fprintf(stderr, "Failed to mmap file %s: %s\n", fname, strerror(errno));
+		return false;
+	}
+
 	// this trick works as both 32 and 64 bit ELF files start with the e_ident[EI_NINDENT] section
 	unsigned char class = data[EI_CLASS];
 
@@ -1009,7 +1014,6 @@ int fusefs_main(int argc, char* argv[], void (* mounted)(void)) {
     sqfs_ll* ll;
     struct fuse_opt fuse_opts[] = {
             {"offset=%zu", offsetof(sqfs_opts, offset), 0},
-            {"auto_unmount", 0},
             {"timeout=%u", offsetof(sqfs_opts, idle_timeout_secs), 0},
             {"fsname=squashfuse", 0},
             {"subtype=squashfuse", 0},
@@ -1042,7 +1046,7 @@ int fusefs_main(int argc, char* argv[], void (* mounted)(void)) {
     opts.image = NULL;
     opts.mountpoint = 0;
     opts.offset = 0;
-    opts.idle_timeout_secs = 1;
+    opts.idle_timeout_secs = 0;
     if (fuse_opt_parse(&args, &opts, fuse_opts, sqfs_opt_proc) == -1)
         sqfs_usage(argv[0], true, true);