wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-11 17:02:42 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential NULL pointer deref, found by Coverity Scan

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2023-03-04 11:59:09 +01:00
parent 3bb2eb2a8d
commit b71605c819
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conf.c
+24 -4
View File
@@ -80,7 +80,7 @@ static TAILQ_HEAD(, conf_change) conf_change_list = TAILQ_HEAD_INITIALIZER(conf_
static int parse_conf(char *file, int is_rcsd);
static void drop_changes(void);
int get_bool(char *arg, int default_value)
static int get_bool(char *arg, int default_value)
{
if (!arg)
goto fallback;
@@ -93,6 +93,16 @@ fallback:
return default_value;
}
static int validate_arg(char *arg, const char *opt)
{
if (!arg) {
errx(1, "option %s missing argument, skipping.", opt);
return 1;
}
return 0;
}
/*
* finit.cond = foo (=> <boot/foo>)
* finit.config = /path/to/etc/alt-finit.conf
@@ -110,11 +120,15 @@ static void parse_finit_opts(char *opt)
*arg++ = 0;
if (string_compare(opt, "cond")) {
if (validate_arg(arg, "finit.cond"))
return;
cond_boot_parse(arg);
return;
}
if (string_compare(opt, "config")) {
if (validate_arg(arg, "finit.config"))
return;
if (finit_conf)
free(finit_conf);
finit_conf = strdup(arg);
@@ -127,6 +141,8 @@ static void parse_finit_opts(char *opt)
}
if (string_compare(opt, "fstab")) {
if (validate_arg(arg, "finit.fstab"))
return;
if (fstab)
free(fstab);
fstab = strdup(arg);
@@ -134,10 +150,8 @@ static void parse_finit_opts(char *opt)
}
if (string_compare(opt, "status_style")) {
if (!arg) {
errx(1, "status_style option requires an argument, skipping.");
if (validate_arg(arg, "finit.status_style"))
return;
}
if (string_compare(arg, "old") || string_compare(arg, "classic"))
show_progress(PROGRESS_CLASSIC);
@@ -161,6 +175,9 @@ static void parse_fsck_opts(char *opt)
*arg++ = 0;
if (string_compare(opt, "mode")) {
if (validate_arg(arg, "fsck.mode"))
return;
if (!strcmp(arg, "skip"))
fsck_mode = NULL;
if (!strcmp(arg, "auto"))
@@ -172,6 +189,9 @@ static void parse_fsck_opts(char *opt)
}
if (string_compare(opt, "repair")) {
if (validate_arg(arg, "fsck.repair"))
return;
if (!strcmp(arg, "no"))
fsck_repair = "-n";
if (!strcmp(arg, "preen"))