luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix some memory leaks when opening a connection fails.

Browse source 
[GB.DB.ODBC]
* BUG: Fix some memory leaks when opening a connection fails.
This commit is contained in:
gambas 2018-05-24 17:59:50 +02:00
parent 502b403728
commit aebc6a0bda
1 changed files with 28 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
gb.db.odbc/src/main.c
View file

@ -163,33 +163,31 @@ void throwODBCError(const char *failedODBCFunctionName,
SQLSMALLINT handleType
)
{
SQLINTEGER i = 0;
SQLINTEGER native;
SQLTCHAR state[7];
SQLTCHAR text[512];
char *errorText = NULL; //GB.NewString("gb.db.odbc: ", 12);
SQLSMALLINT len;
SQLRETURN ret;
SQLINTEGER i = 0;
SQLINTEGER native;
SQLTCHAR state[7];
SQLTCHAR text[512];
char *errorText = GB.NewString("gb.db.odbc: ", 12);
SQLSMALLINT len;
SQLRETURN ret;
errorText = GB.AddString(errorText, (char *)failedODBCFunctionName, 0),
errorText = GB.AddString(errorText, " failed:", 0);
errorText = GB.AddString(errorText, (char *)failedODBCFunctionName, 0),
errorText = GB.AddString(errorText, " failed:", 0);
do
{
ret = SQLGetDiagRec(handleType, handle, ++i, state, &native, text, sizeof(text), &len);
if (SQL_SUCCEEDED(ret))
{
errorText = GB.AddString(errorText, "\n", 1);
errorText = GB.AddString(errorText, (char *)state, 0);
errorText = GB.AddString(errorText, (char *)text, len);
}
}
while (ret == SQL_SUCCESS);
GB.Error(errorText);
GB.FreeString(&errorText);
do
{
ret = SQLGetDiagRec(handleType, handle, ++i, state, &native, text, sizeof(text), &len);
if (SQL_SUCCEEDED(ret))
{
errorText = GB.AddString(errorText, "\n", 1);
errorText = GB.AddString(errorText, (char *)state, 0);
errorText = GB.AddString(errorText, (char *)text, len);
}
}
while (ret == SQL_SUCCESS);
GB.Error(errorText);
GB.FreeString(&errorText);
}
@ -823,11 +821,9 @@ fflush(stderr);
//zxMarce: Must bail out NOW if failed to connect, or nonsense errors will appear.
if (!SQL_SUCCEEDED(retcode))
{
throwODBCError((hostIsAConnString ? "SQLDriverConnect" : "SQLConnect"),
odbc->odbcHandle,
SQL_HANDLE_DBC
);
//GB.Error("Error connecting to database");
throwODBCError((hostIsAConnString ? "SQLDriverConnect" : "SQLConnect"), odbc->odbcHandle, SQL_HANDLE_DBC);
free(odbc);
//GB.Error("Error connecting to database");
return TRUE;
}
@ -851,10 +847,8 @@ fflush(stderr);
retcode = SQLGetFunctions(odbc->odbcHandle, SQL_API_SQLFETCHSCROLL, &odbc->FetchScroll_exist);
if (!SQL_SUCCEEDED(retcode))
{
throwODBCError("SQLGetFunctions SQL_API_SQLFETCHSCROLL",
odbc->odbcHandle,
SQL_HANDLE_DBC
);
throwODBCError("SQLGetFunctions SQL_API_SQLFETCHSCROLL", odbc->odbcHandle, SQL_HANDLE_DBC);
free(odbc);
//GB.Error("Error calling the ODBC SQLGetFunctions API");
return TRUE;
}
@ -868,9 +862,9 @@ fflush(stderr);
db->handle = odbc;
return FALSE;
}
/*****************************************************************************
close_database()