diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-09-21 14:18:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-09-21 14:18:35 +0200 |
| commit | c6bdbf6e93a11227f91fbf15b7a36dceb60c526d (patch) | |
| tree | 9ab0f7472fca0a91ecd0f41d3b1caf167ff34f2d /common | |
| parent | 16a3b9f241861aaf7ddd6f284e111aad291c508f (diff) | |
| download | barebox-c6bdbf6e93a11227f91fbf15b7a36dceb60c526d.tar.gz barebox-c6bdbf6e93a11227f91fbf15b7a36dceb60c526d.tar.xz | |
environment: Allow default env path to be NULL
Several places assume that the default environment path cannot be NULL.
Allow NULL here without crashing.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/environment.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/common/environment.c b/common/environment.c index 0edf34b661..56a030eda0 100644 --- a/common/environment.c +++ b/common/environment.c @@ -256,9 +256,12 @@ int envfs_save(const char *filename, const char *dirname, unsigned flags) struct action_data data = {}; void *buf = NULL, *wbuf; struct envfs_entry *env; + const char *defenv_path = default_environment_path_get(); if (!filename) - filename = default_environment_path_get(); + filename = defenv_path; + if (!filename) + return -ENOENT; if (!dirname) dirname = "/env"; @@ -365,7 +368,7 @@ int envfs_save(const char *filename, const char *dirname, unsigned flags) ret = 0; #ifdef CONFIG_NVVAR - if (!strcmp(filename, default_environment_path_get())) + if (defenv_path && !strcmp(filename, defenv_path)) nv_var_set_clean(); #endif out: @@ -558,6 +561,8 @@ int envfs_load(const char *filename, const char *dir, unsigned flags) if (!filename) filename = default_environment_path_get(); + if (!filename) + return -ENOENT; if (!dir) dir = "/env"; |