lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-09-18 18:22:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ODBC memory management

Browse Source 
Check proper closure sequence of Statements/Connections/Env

SQLDisconnect now closes automatically all attached statements.
This commit is contained in:
Nirgal Vourgère
2013-07-03 19:32:53 +02:00
parent aac9c61536
commit 66b87caf26
2 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/odbc/mdbodbc.h
View File

@@ -37,11 +37,13 @@ extern "C" {
#endif #endif
struct _henv { struct _henv {
MdbSQL *sql; MdbSQL *sql;
GPtrArray *connections;
}; };
struct _hdbc { struct _hdbc {
struct _henv *henv; struct _henv *henv;
ConnectParams* params; ConnectParams* params;
GPtrArray *statements;
}; };
struct _hstmt { struct _hstmt {
struct _hdbc *hdbc; struct _hdbc *hdbc;

45
src/odbc/odbc.c
View File

@@ -545,8 +545,9 @@ struct _hdbc* dbc;
env = (struct _henv *) henv; env = (struct _henv *) henv;
dbc = (SQLHDBC) g_malloc0(sizeof(struct _hdbc)); dbc = (SQLHDBC) g_malloc0(sizeof(struct _hdbc));
dbc->henv=env; dbc->henv=env;
g_ptr_array_add(env->connections, dbc);
dbc->params = NewConnectParams (); dbc->params = NewConnectParams ();
dbc->statements = g_ptr_array_new();
*phdbc=dbc; *phdbc=dbc;
return SQL_SUCCESS; return SQL_SUCCESS;
@@ -566,10 +567,12 @@ struct _henv *env;
TRACE("_SQLAllocEnv"); TRACE("_SQLAllocEnv");
env = (SQLHENV) g_malloc0(sizeof(struct _henv)); env = (SQLHENV) g_malloc0(sizeof(struct _henv));
*phenv=env;
env->sql = mdb_sql_init(); env->sql = mdb_sql_init();
env->connections = g_ptr_array_new();
*phenv=env;
return SQL_SUCCESS; return SQL_SUCCESS;
} }
SQLRETURN SQL_API SQLAllocEnv( SQLRETURN SQL_API SQLAllocEnv(
SQLHENV *phenv) SQLHENV *phenv)
{ {
@@ -581,18 +584,20 @@ static SQLRETURN SQL_API _SQLAllocStmt(
SQLHDBC hdbc, SQLHDBC hdbc,
SQLHSTMT *phstmt) SQLHSTMT *phstmt)
{ {
/*struct _hdbc *dbc;*/ struct _hdbc *dbc;
struct _hstmt *stmt; struct _hstmt *stmt;
TRACE("_SQLAllocStmt"); TRACE("_SQLAllocStmt");
/*dbc = (struct _hdbc *) hdbc;*/ dbc = (struct _hdbc *) hdbc;
stmt = (SQLHSTMT) g_malloc0(sizeof(struct _hstmt)); stmt = (SQLHSTMT) g_malloc0(sizeof(struct _hstmt));
stmt->hdbc=hdbc; stmt->hdbc=dbc;
*phstmt = stmt; g_ptr_array_add(dbc->statements, stmt);
*phstmt = stmt;
return SQL_SUCCESS; return SQL_SUCCESS;
} }
SQLRETURN SQL_API SQLAllocStmt( SQLRETURN SQL_API SQLAllocStmt(
SQLHDBC hdbc, SQLHDBC hdbc,
SQLHSTMT *phstmt) SQLHSTMT *phstmt)
@@ -956,6 +961,9 @@ SQLRETURN SQL_API SQLDisconnect(
dbc = (struct _hdbc *) hdbc; dbc = (struct _hdbc *) hdbc;
env = (struct _henv *) dbc->henv; env = (struct _henv *) dbc->henv;
// Automatically close all statements:
while (dbc->statements->len)
_SQLFreeStmt(g_ptr_array_index(dbc->statements, 0), SQL_DROP);
mdb_sql_close(env->sql); mdb_sql_close(env->sql);
return SQL_SUCCESS; return SQL_SUCCESS;
@@ -1202,14 +1210,27 @@ static SQLRETURN SQL_API _SQLFreeConnect(
SQLHDBC hdbc) SQLHDBC hdbc)
{ {
struct _hdbc* dbc = (struct _hdbc*) hdbc; struct _hdbc* dbc = (struct _hdbc*) hdbc;
struct _henv* env;
TRACE("_SQLFreeConnect"); TRACE("_SQLFreeConnect");
env = dbc->henv;
if (dbc->statements->len) {
// Function sequence error
strcpy(sqlState, "HY010");
return SQL_ERROR;
}
if (!g_ptr_array_remove(env->connections, dbc))
return SQL_INVALID_HANDLE;
FreeConnectParams(dbc->params); FreeConnectParams(dbc->params);
g_ptr_array_free(dbc->statements, TRUE);
g_free(dbc); g_free(dbc);
return SQL_SUCCESS; return SQL_SUCCESS;
} }
SQLRETURN SQL_API SQLFreeConnect( SQLRETURN SQL_API SQLFreeConnect(
SQLHDBC hdbc) SQLHDBC hdbc)
{ {
@@ -1220,7 +1241,17 @@ SQLRETURN SQL_API SQLFreeConnect(
static SQLRETURN SQL_API _SQLFreeEnv( static SQLRETURN SQL_API _SQLFreeEnv(
SQLHENV henv) SQLHENV henv)
{ {
struct _henv* env = (struct _henv*)henv;
TRACE("_SQLFreeEnv"); TRACE("_SQLFreeEnv");
if (env->connections->len) {
// Function sequence error
strcpy(sqlState, "HY010");
return SQL_ERROR;
}
g_ptr_array_free(env->connections, TRUE);
return SQL_SUCCESS; return SQL_SUCCESS;
} }
SQLRETURN SQL_API SQLFreeEnv( SQLRETURN SQL_API SQLFreeEnv(
@@ -1241,6 +1272,8 @@ static SQLRETURN SQL_API _SQLFreeStmt(
TRACE("_SQLFreeStmt"); TRACE("_SQLFreeStmt");
if (fOption==SQL_DROP) { if (fOption==SQL_DROP) {
if (!g_ptr_array_remove(dbc->statements, stmt))
return SQL_INVALID_HANDLE;
mdb_sql_reset(sql); mdb_sql_reset(sql);
unbind_columns(stmt); unbind_columns(stmt);
g_free(stmt); g_free(stmt);