diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2017-02-19 13:24:44 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-02-19 13:24:44 -0600 |
| commit | a6225d100eecfef74172ef308b7eb066e19488e5 (patch) | |
| tree | 8d0d1a66276b17b98408f377c491286f0b0b00b3 | |
| parent | 0d9cfff45eafc5e2fcea7dd19306b495db04222d (diff) | |
| parent | 44abe214d24f772b9d66a96d592aa15c17c7c429 (diff) | |
Merge "res_config_sqlite3: Fix crash when loading with invalid config"
| -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 b5c70ec2d..f2a6b00db 100644 --- a/res/res_config_sqlite3.c +++ b/res/res_config_sqlite3.c @@ -1125,6 +1125,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; |