kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-29 15:36:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix locking issues with channel datastores in func_odbc.c.

Browse Source 
* Fixed a potential memory leak when an existing datastore is manually
destroyed by inline code instead of calling ast_datastore_free().

(closes issue ASTERISK-17948)
Reported by: Archie Cobbs

Review: https://reviewboard.asterisk.org/r/1687/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@352291 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2012-01-24 16:59:59 +00:00
parent d7a25693c9
commit cf450c7db1
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
funcs/func_odbc.c
View File

@@ -727,8 +727,7 @@ end_acf_read:
ast_channel_lock(chan); ast_channel_lock(chan);
if ((odbc_store = ast_channel_datastore_find(chan, &odbc_info, buf))) { if ((odbc_store = ast_channel_datastore_find(chan, &odbc_info, buf))) {
ast_channel_datastore_remove(chan, odbc_store); ast_channel_datastore_remove(chan, odbc_store);
odbc_datastore_free(odbc_store->data); ast_datastore_free(odbc_store);
ast_free(odbc_store);
} }
ast_channel_unlock(chan); ast_channel_unlock(chan);
} }
@@ -745,7 +744,9 @@ end_acf_read:
return -1; return -1;
} }
odbc_store->data = resultset; odbc_store->data = resultset;
ast_channel_lock(chan);
ast_channel_datastore_add(chan, odbc_store); ast_channel_datastore_add(chan, odbc_store);
ast_channel_unlock(chan);
} }
} }
SQLCloseCursor(stmt); SQLCloseCursor(stmt);
@@ -791,8 +792,11 @@ static int acf_fetch(struct ast_channel *chan, const char *cmd, char *data, char
struct ast_datastore *store; struct ast_datastore *store;
struct odbc_datastore *resultset; struct odbc_datastore *resultset;
struct odbc_datastore_row *row; struct odbc_datastore_row *row;
ast_channel_lock(chan);
store = ast_channel_datastore_find(chan, &odbc_info, data); store = ast_channel_datastore_find(chan, &odbc_info, data);
if (!store) { if (!store) {
ast_channel_unlock(chan);
pbx_builtin_setvar_helper(chan, "ODBC_FETCH_STATUS", "FAILURE"); pbx_builtin_setvar_helper(chan, "ODBC_FETCH_STATUS", "FAILURE");
return -1; return -1;
} }
@@ -804,10 +808,12 @@ static int acf_fetch(struct ast_channel *chan, const char *cmd, char *data, char
/* Cleanup datastore */ /* Cleanup datastore */
ast_channel_datastore_remove(chan, store); ast_channel_datastore_remove(chan, store);
ast_datastore_free(store); ast_datastore_free(store);
ast_channel_unlock(chan);
pbx_builtin_setvar_helper(chan, "ODBC_FETCH_STATUS", "FAILURE"); pbx_builtin_setvar_helper(chan, "ODBC_FETCH_STATUS", "FAILURE");
return -1; return -1;
} }
pbx_builtin_setvar_helper(chan, "~ODBCFIELDS~", resultset->names); pbx_builtin_setvar_helper(chan, "~ODBCFIELDS~", resultset->names);
ast_channel_unlock(chan);
ast_copy_string(buf, row->data, len); ast_copy_string(buf, row->data, len);
ast_free(row); ast_free(row);
pbx_builtin_setvar_helper(chan, "ODBC_FETCH_STATUS", "SUCCESS"); pbx_builtin_setvar_helper(chan, "ODBC_FETCH_STATUS", "SUCCESS");
@@ -824,11 +830,15 @@ static char *app_odbcfinish = "ODBCFinish";
static int exec_odbcfinish(struct ast_channel *chan, const char *data) static int exec_odbcfinish(struct ast_channel *chan, const char *data)
{ {
struct ast_datastore *store = ast_channel_datastore_find(chan, &odbc_info, data); struct ast_datastore *store;
if (!store) /* Already freed; no big deal. */
return 0; ast_channel_lock(chan);
store = ast_channel_datastore_find(chan, &odbc_info, data);
if (store) {
ast_channel_datastore_remove(chan, store); ast_channel_datastore_remove(chan, store);
ast_datastore_free(store); ast_datastore_free(store);
}
ast_channel_unlock(chan);
return 0; return 0;
} }