diff options
author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-07-25 07:09:49 +0000 |
---|---|---|
committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-07-25 07:09:49 +0000 |
commit | 4186d7523c6e65dbbb53ab0bfee054fd41dea563 (patch) | |
tree | 1debb099c2765a0d8d7d180f907e686466a928d7 /navit/start_real.c | |
parent | 5355ea1c1288a7554105e3107c1b8835f40bbec7 (diff) | |
download | navit-svn-4186d7523c6e65dbbb53ab0bfee054fd41dea563.tar.gz |
Fix:core:Do not crash if config file contains no Navit config.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5824 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/start_real.c')
-rw-r--r-- | navit/start_real.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/navit/start_real.c b/navit/start_real.c index 67478a07..8abd0bbd 100644 --- a/navit/start_real.c +++ b/navit/start_real.c @@ -203,12 +203,15 @@ int main_real(int argc, char * const* argv) } else { dbg(0, _("Using config file '%s'\n"), config_file); } + if (! config) { + dbg(0, _("Error: No configuration found in config file '%s'\n"), config_file); + } while (li) { g_free(li->data); li = g_list_next(li); } g_list_free(list); - if (! config_get_attr(config, attr_navit, &navit, NULL) && !config_empty_ok) { + if (! (config && config_get_attr(config, attr_navit, &navit, NULL))) { dbg(0, "%s", _("Internal initialization failed, exiting. Check previous error messages.\n")); exit(5); } |