diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2017-02-19 12:37:05 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-02-19 12:37:06 -0600 |
| commit | 919fe211553ff57c74440e1329b2a2c2e0d649ce (patch) | |
| tree | d7e043fef879c9b7697a45240dfea921993d51e2 | |
| parent | 047a1e7dcc3e89fa951c5d714c68cd7fd2d09b37 (diff) | |
| parent | 5b7c6678aedfe9cb196442b9170870d5ac352402 (diff) | |
Merge "res_config_sqlite3: Fix crash when loading with invalid config" into 13
| -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; |