alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

load_config: move NULL path check before first use

Browse source 
Found through static analysis
This commit is contained in:
Dominique Martinet 2018-07-01 23:36:44 +09:00
parent 8c526bbb03
commit 4eeca10a8a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/config.c
View file

@ -302,6 +302,11 @@ static char *get_config_path(void) {
const char *current_config_path; const char *current_config_path;
static bool load_config(const char *path, struct sway_config *config) { static bool load_config(const char *path, struct sway_config *config) {
if (path == NULL) {
wlr_log(L_ERROR, "Unable to find a config file!");
return false;
}
wlr_log(L_INFO, "Loading config from %s", path); wlr_log(L_INFO, "Loading config from %s", path);
current_config_path = path; current_config_path = path;
@ -310,11 +315,6 @@ static bool load_config(const char *path, struct sway_config *config) {
return false; return false;
} }
if (path == NULL) {
wlr_log(L_ERROR, "Unable to find a config file!");
return false;
}
FILE *f = fopen(path, "r"); FILE *f = fopen(path, "r");
if (!f) { if (!f) {
wlr_log(L_ERROR, "Unable to open %s for reading", path); wlr_log(L_ERROR, "Unable to open %s for reading", path);