diff options
author | Sean Bright <sean.bright@gmail.com> | 2017-02-15 12:55:19 -0500 |
---|---|---|
committer | Sean Bright <sean.bright@gmail.com> | 2017-02-18 13:17:27 -0500 |
commit | 5b7c6678aedfe9cb196442b9170870d5ac352402 (patch) | |
tree | 4839eb3483d258764fe35a2ecbe23c00d6d8f849 /res | |
parent | 2b10ba807431acc06502575a2928ba957d2726c8 (diff) |
res_config_sqlite3: Fix crash when loading with invalid config
When ast_config_load() fails with CONFIG_STATUS_FILEINVALID, it has
already destroyed the ast_config struct for us. Trying to do it again
results in a crash.
Change-Id: If6a5c0ca718ad428e01a1fb25beb209a9ac18bc6
Diffstat (limited to 'res')
-rw-r--r-- | res/res_config_sqlite3.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_config_sqlite3.c b/res/res_config_sqlite3.c index 4c4b82051..39d4f08ad 100644 --- a/res/res_config_sqlite3.c +++ b/res/res_config_sqlite3.c @@ -1127,6 +1127,8 @@ static int parse_config(int reload) if (config == CONFIG_STATUS_FILEMISSING || config == CONFIG_STATUS_FILEINVALID) { ast_log(LOG_ERROR, "%s config file '%s'\n", config == CONFIG_STATUS_FILEMISSING ? "Missing" : "Invalid", config_filename); + ast_mutex_unlock(&config_lock); + return 0; } else { const char *cat; struct realtime_sqlite3_db *db; |