kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 22:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds PQclear calls on result to various parts of res_conf_pgsql

Browse Source 
(closes issue ASTERISK-17812)
Reported by: byronclark
Patches: 
      pgsql_pqclear.patch uploaded by byronclark (license 1200)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@323610 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2011-06-15 16:09:24 +00:00
parent 0701feaa95
commit 9d849f5446
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/res_config_pgsql.c
View File

@@ -221,6 +221,7 @@ static struct tables *find_table(const char *orig_tablename)
if (!(table = ast_calloc(1, sizeof(*table) + strlen(orig_tablename) + 1))) { if (!(table = ast_calloc(1, sizeof(*table) + strlen(orig_tablename) + 1))) {
ast_log(LOG_ERROR, "Unable to allocate memory for new table structure\n"); ast_log(LOG_ERROR, "Unable to allocate memory for new table structure\n");
PQclear(result);
AST_LIST_UNLOCK(&psql_tables); AST_LIST_UNLOCK(&psql_tables);
return NULL; return NULL;
} }
@@ -239,6 +240,7 @@ static struct tables *find_table(const char *orig_tablename)
if (!(column = ast_calloc(1, sizeof(*column) + strlen(fname) + strlen(ftype) + 2))) { if (!(column = ast_calloc(1, sizeof(*column) + strlen(fname) + strlen(ftype) + 2))) {
ast_log(LOG_ERROR, "Unable to allocate column element for %s, %s\n", orig_tablename, fname); ast_log(LOG_ERROR, "Unable to allocate column element for %s, %s\n", orig_tablename, fname);
PQclear(result);
destroy_table(table); destroy_table(table);
AST_LIST_UNLOCK(&psql_tables); AST_LIST_UNLOCK(&psql_tables);
return NULL; return NULL;
@@ -363,6 +365,7 @@ static struct ast_variable *realtime_pgsql(const char *database, const char *tab
"PostgreSQL RealTime: Failed to query '%s@%s'. Check debug for more info.\n", tablename, database); "PostgreSQL RealTime: Failed to query '%s@%s'. Check debug for more info.\n", tablename, database);
ast_debug(1, "PostgreSQL RealTime: Query: %s\n", ast_str_buffer(sql)); ast_debug(1, "PostgreSQL RealTime: Query: %s\n", ast_str_buffer(sql));
ast_debug(1, "PostgreSQL RealTime: Query Failed because: %s\n", PQerrorMessage(pgsqlConn)); ast_debug(1, "PostgreSQL RealTime: Query Failed because: %s\n", PQerrorMessage(pgsqlConn));
PQclear(result);
ast_mutex_unlock(&pgsql_lock); ast_mutex_unlock(&pgsql_lock);
return NULL; return NULL;
} else { } else {
@@ -391,8 +394,8 @@ static struct ast_variable *realtime_pgsql(const char *database, const char *tab
ast_debug(1, "PostgreSQL RealTime: Found %d rows.\n", num_rows); ast_debug(1, "PostgreSQL RealTime: Found %d rows.\n", num_rows);
if (!(fieldnames = ast_calloc(1, numFields * sizeof(char *)))) { if (!(fieldnames = ast_calloc(1, numFields * sizeof(char *)))) {
ast_mutex_unlock(&pgsql_lock);
PQclear(result); PQclear(result);
ast_mutex_unlock(&pgsql_lock);
return NULL; return NULL;
} }
for (i = 0; i < numFields; i++) for (i = 0; i < numFields; i++)
@@ -420,8 +423,8 @@ static struct ast_variable *realtime_pgsql(const char *database, const char *tab
ast_debug(1, "Postgresql RealTime: Could not find any rows in table %s@%s.\n", tablename, database); ast_debug(1, "Postgresql RealTime: Could not find any rows in table %s@%s.\n", tablename, database);
} }
ast_mutex_unlock(&pgsql_lock);
PQclear(result); PQclear(result);
ast_mutex_unlock(&pgsql_lock);
return var; return var;
} }
@@ -530,6 +533,7 @@ static struct ast_config *realtime_multi_pgsql(const char *database, const char
ast_debug(1, "PostgreSQL RealTime: Query: %s\n", ast_str_buffer(sql)); ast_debug(1, "PostgreSQL RealTime: Query: %s\n", ast_str_buffer(sql));
ast_debug(1, "PostgreSQL RealTime: Query Failed because: %s (%s)\n", ast_debug(1, "PostgreSQL RealTime: Query Failed because: %s (%s)\n",
PQresultErrorMessage(result), PQresStatus(result_status)); PQresultErrorMessage(result), PQresStatus(result_status));
PQclear(result);
ast_mutex_unlock(&pgsql_lock); ast_mutex_unlock(&pgsql_lock);
return NULL; return NULL;
} }
@@ -546,8 +550,8 @@ static struct ast_config *realtime_multi_pgsql(const char *database, const char
ast_debug(1, "PostgreSQL RealTime: Found %d rows.\n", num_rows); ast_debug(1, "PostgreSQL RealTime: Found %d rows.\n", num_rows);
if (!(fieldnames = ast_calloc(1, numFields * sizeof(char *)))) { if (!(fieldnames = ast_calloc(1, numFields * sizeof(char *)))) {
ast_mutex_unlock(&pgsql_lock);
PQclear(result); PQclear(result);
ast_mutex_unlock(&pgsql_lock);
return NULL; return NULL;
} }
for (i = 0; i < numFields; i++) for (i = 0; i < numFields; i++)
@@ -577,8 +581,8 @@ static struct ast_config *realtime_multi_pgsql(const char *database, const char
ast_debug(1, "PostgreSQL RealTime: Could not find any rows in table %s.\n", table); ast_debug(1, "PostgreSQL RealTime: Could not find any rows in table %s.\n", table);
} }
ast_mutex_unlock(&pgsql_lock);
PQclear(result); PQclear(result);
ast_mutex_unlock(&pgsql_lock);
return cfg; return cfg;
} }
@@ -699,6 +703,7 @@ static int update_pgsql(const char *database, const char *tablename, const char
ast_debug(1, "PostgreSQL RealTime: Query: %s\n", ast_str_buffer(sql)); ast_debug(1, "PostgreSQL RealTime: Query: %s\n", ast_str_buffer(sql));
ast_debug(1, "PostgreSQL RealTime: Query Failed because: %s (%s)\n", ast_debug(1, "PostgreSQL RealTime: Query Failed because: %s (%s)\n",
PQresultErrorMessage(result), PQresStatus(result_status)); PQresultErrorMessage(result), PQresStatus(result_status));
PQclear(result);
ast_mutex_unlock(&pgsql_lock); ast_mutex_unlock(&pgsql_lock);
return -1; return -1;
} }
@@ -929,6 +934,7 @@ static int store_pgsql(const char *database, const char *table, va_list ap)
} }
insertid = PQoidValue(result); insertid = PQoidValue(result);
PQclear(result);
ast_mutex_unlock(&pgsql_lock); ast_mutex_unlock(&pgsql_lock);
ast_debug(1, "PostgreSQL RealTime: row inserted on table: %s, id: %u\n", table, insertid); ast_debug(1, "PostgreSQL RealTime: row inserted on table: %s, id: %u\n", table, insertid);