libs,daemons: fix a couple of crashes in the daemons

Meulengracht · Feb 14, 2025 · f201374 · f201374
1 parent 92a5b46
commit f201374
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/daemons/cookd/server/server.c b/daemons/cookd/server/server.c
@@ -308,6 +308,9 @@ int cookd_server_init(gracht_client_t* client, int builderCount)
 void cookd_server_cleanup(void)
 {
     VLOG_DEBUG("cookd", "cookd_server_cleanup()\n");
+    if (g_server == NULL) {
+        return;
+    }
 
     __cookd_server_stop(g_server);
     __cookd_server_delete(g_server);

diff --git a/libs/vlog/logf.c b/libs/vlog/logf.c
@@ -470,7 +470,7 @@ void vlog_output(enum vlog_level level, const char* tag, const char* format, ...
         int                 colsWritten = 0;
 
         // ensure level is appropriate for output
-        if (output->handle != NULL && level > output->level) {
+        if (output->handle == NULL || level > output->level) {
             continue;
         }
 

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -11,6 +11,8 @@ grade: stable
 confinement: strict
 assumes: [snap-uid-envvars]
 
+architectures: [amd64,arm64,riscv64,ppc64el,s390x]
+
 apps:
   bake:
     command: usr/bin/bake