Merge pull request #2932 from cgwalters/aboot-fix-nullderef

mount: Fix gcc -fanalyzer warning for parsing androidboot.slot_suffix
ostreedev · Jul 14, 2023 · c1ac6bc · c1ac6bc
2 parents c4f1d18 + c078e8b
commit c1ac6bc
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/switchroot/ostree-mount-util.h b/src/switchroot/ostree-mount-util.h
@@ -137,6 +137,9 @@ static inline char *
 get_aboot_root_slot (void)
 {
   autofree char *slot_suffix = read_proc_cmdline_key ("androidboot.slot_suffix");
+  if (!slot_suffix)
+    errx (EXIT_FAILURE, "Missing androidboot.slot_suffix");
+
   if (strcmp (slot_suffix, "_a") == 0)
     return strdup ("/ostree/root.a");
   else if (strcmp (slot_suffix, "_b") == 0)