integritysetup: Check args to prevent assert

The utility function parse_integrity_options is used to both validate
integritytab options or validate and return values.  In the case where
we are validating only and we have specific value options we will
assert.

diff --git a/src/integritysetup/integrity-util.c b/src/integritysetup/integrity-util.c
index 5970a136b8c5f138231fb8af7cb9dfd39ab54545..c2d2f950de56d05848ea09e1506b2b4381accf73 100644 (file)
--- a/src/integritysetup/integrity-util.c
+++ b/src/integritysetup/integrity-util.c
@@ -48,16 +48,20 @@ int parse_integrity_options(
                         if (ret_commit_time)
                                 *ret_commit_time = tmp_commit_time;
                 } else if ((val = startswith(word, "data-device="))) {
-                        r = free_and_strdup(ret_data_device, val);
-                        if (r < 0)
-                                return log_oom();
+                        if (ret_data_device) {
+                                r = free_and_strdup(ret_data_device, val);
+                                if (r < 0)
+                                        return log_oom();
+                        }
                 } else if ((val = startswith(word, "integrity-algorithm="))) {
-                        r = free_and_strdup(ret_integrity_alg, val);
-                        if (r < 0)
-                                return log_oom();
-                        r = supported_integrity_algorithm(*ret_integrity_alg);
+                        r = supported_integrity_algorithm(val);
                         if (r < 0)
                                 return r;
+                        if (ret_integrity_alg) {
+                                r = free_and_strdup(ret_integrity_alg, val);
+                                if (r < 0)
+                                        return log_oom();
+                        }
                 } else
                         log_warning("Encountered unknown option '%s', ignoring.", word);
         }