MonetDB: odbc-tls - Valgrind

[Joeri van Ruth via checkin-list]

Changeset: af5ad4b5e3f2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/af5ad4b5e3f2
Modified Files:
        clients/odbc/driver/SQLConnect.c
        clients/odbc/samples/odbcconnect.c
Branch: odbc-tls
Log Message:

Valgrind


diffs (31 lines):

diff --git a/clients/odbc/driver/SQLConnect.c b/clients/odbc/driver/SQLConnect.c
--- a/clients/odbc/driver/SQLConnect.c
+++ b/clients/odbc/driver/SQLConnect.c
@@ -530,6 +530,7 @@ MNDBConnectSettings(ODBCDbc *dbc, const 
                const char *error_state = "08001";
                const char *error_explanation = mid ? mapi_error_str(mid) : 
NULL;
                addDbcError(dbc, error_state, error_explanation, 0);
+               msettings_destroy(clone);
                return SQL_ERROR;
        }
 
@@ -543,7 +544,7 @@ MNDBConnectSettings(ODBCDbc *dbc, const 
        msettings_destroy(dbc->settings);
        dbc->settings = clone;
 
-       dbc->mapToLongVarchar = msetting_long(settings, MP_MAPTOLONGVARCHAR);
+       dbc->mapToLongVarchar = msetting_long(dbc->settings, 
MP_MAPTOLONGVARCHAR);
 
        dbc->Connected = true;
 
diff --git a/clients/odbc/samples/odbcconnect.c 
b/clients/odbc/samples/odbcconnect.c
--- a/clients/odbc/samples/odbcconnect.c
+++ b/clients/odbc/samples/odbcconnect.c
@@ -111,6 +111,7 @@ main(int argc, char **argv)
        SQLDisconnect(conn);
        SQLFreeHandle(SQL_HANDLE_DBC, conn);
        SQLFreeHandle(SQL_HANDLE_DBC, env);
+       free(targets);
 
        return ret;
 }
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org