kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_config_pgsql: Release table locks where appropriate

Browse Source 
The find_table() functions NULL or a locked table pointer. We are
not consistently calling release_table() in failure paths.

Change-Id: I6f665b455799c84b036e5b34904b82b05eab9544
This commit is contained in:
Sean Bright
2017-02-28 10:41:45 -05:00
parent 6ebdcfe27d
commit e5b44c26b4
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/res_config_pgsql.c
View File

@@ -733,6 +733,7 @@ static int update_pgsql(const char *database, const char *tablename, const char
ast_mutex_lock(&pgsql_lock); ast_mutex_lock(&pgsql_lock);
if (!pgsql_reconnect(database)) { if (!pgsql_reconnect(database)) {
ast_mutex_unlock(&pgsql_lock); ast_mutex_unlock(&pgsql_lock);
release_table(table);
return -1; return -1;
} }
@@ -878,6 +879,7 @@ static int update2_pgsql(const char *database, const char *tablename, const stru
ast_mutex_lock(&pgsql_lock); ast_mutex_lock(&pgsql_lock);
if (!pgsql_reconnect(database)) { if (!pgsql_reconnect(database)) {
ast_mutex_unlock(&pgsql_lock); ast_mutex_unlock(&pgsql_lock);
release_table(table);
return -1; return -1;
} }
@@ -1322,6 +1324,7 @@ static int require_pgsql(const char *database, const char *tablename, va_list ap
if (pgsql_exec(database, tablename, ast_str_buffer(sql), &result) != 0) { if (pgsql_exec(database, tablename, ast_str_buffer(sql), &result) != 0) {
ast_mutex_unlock(&pgsql_lock); ast_mutex_unlock(&pgsql_lock);
release_table(table);
return -1; return -1;
} }