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

On some drivers, deallocating the statement handle isn't enough. We also have to clear the cursor (nice, Oracle)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@66919 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-06-01 21:45:44 +00:00
parent a90cf2d802
commit 70b882702c
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
funcs/func_odbc.c
View File

@@ -82,6 +82,7 @@ static SQLHSTMT generic_prepare(struct odbc_obj *obj, void *data)
res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS); res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS);
if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
ast_log(LOG_WARNING, "SQL Prepare failed![%s]\n", sql); ast_log(LOG_WARNING, "SQL Prepare failed![%s]\n", sql);
SQLCloseCursor(stmt);
SQLFreeHandle (SQL_HANDLE_STMT, stmt); SQLFreeHandle (SQL_HANDLE_STMT, stmt);
return NULL; return NULL;
} }
@@ -184,8 +185,10 @@ static int acf_odbc_write(struct ast_channel *chan, char *cmd, char *s, const ch
snprintf(varname, sizeof(varname), "%d", (int)rows); snprintf(varname, sizeof(varname), "%d", (int)rows);
pbx_builtin_setvar_helper(chan, "ODBCROWS", varname); pbx_builtin_setvar_helper(chan, "ODBCROWS", varname);
if (stmt) if (stmt) {
SQLCloseCursor(stmt);
SQLFreeHandle(SQL_HANDLE_STMT, stmt); SQLFreeHandle(SQL_HANDLE_STMT, stmt);
}
if (obj) if (obj)
ast_odbc_release_obj(obj); ast_odbc_release_obj(obj);
@@ -255,6 +258,7 @@ static int acf_odbc_read(struct ast_channel *chan, char *cmd, char *s, char *buf
res = SQLNumResultCols(stmt, &colcount); res = SQLNumResultCols(stmt, &colcount);
if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
ast_log(LOG_WARNING, "SQL Column Count error!\n[%s]\n\n", sql); ast_log(LOG_WARNING, "SQL Column Count error!\n[%s]\n\n", sql);
SQLCloseCursor(stmt);
SQLFreeHandle (SQL_HANDLE_STMT, stmt); SQLFreeHandle (SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj); ast_odbc_release_obj(obj);
return -1; return -1;
@@ -273,6 +277,7 @@ static int acf_odbc_read(struct ast_channel *chan, char *cmd, char *s, char *buf
} else if (option_verbose > 3) { } else if (option_verbose > 3) {
ast_log(LOG_WARNING, "Error %d in FETCH [%s]\n", res, sql); ast_log(LOG_WARNING, "Error %d in FETCH [%s]\n", res, sql);
} }
SQLCloseCursor(stmt);
SQLFreeHandle(SQL_HANDLE_STMT, stmt); SQLFreeHandle(SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj); ast_odbc_release_obj(obj);
return res1; return res1;
@@ -291,6 +296,7 @@ static int acf_odbc_read(struct ast_channel *chan, char *cmd, char *s, char *buf
if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
ast_log(LOG_WARNING, "SQL Get Data error!\n[%s]\n\n", sql); ast_log(LOG_WARNING, "SQL Get Data error!\n[%s]\n\n", sql);
SQLCloseCursor(stmt);
SQLFreeHandle(SQL_HANDLE_STMT, stmt); SQLFreeHandle(SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj); ast_odbc_release_obj(obj);
return -1; return -1;
@@ -316,6 +322,7 @@ static int acf_odbc_read(struct ast_channel *chan, char *cmd, char *s, char *buf
/* Trim trailing comma */ /* Trim trailing comma */
buf[buflen - 1] = '\0'; buf[buflen - 1] = '\0';
SQLCloseCursor(stmt);
SQLFreeHandle(SQL_HANDLE_STMT, stmt); SQLFreeHandle(SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj); ast_odbc_release_obj(obj);
return 0; return 0;