MonetDB: odbc-tls - ServerName can be null in SQLConnect

[Joeri van Ruth via checkin-list]

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

ServerName can be null in SQLConnect


diffs (22 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
@@ -302,12 +302,14 @@ MNDBConnect(ODBCDbc *dbc,
        // ServerName is really the Data Source name
        if (!makeNulTerminated(&ServerName, NameLength1, &scratch))
                goto failure;
-       dsn = strdup((char*)ServerName);
-       if (dsn == NULL)
-               goto failure;
+       if (ServerName != NULL) {
+               dsn = strdup((char*)ServerName);
+               if (dsn == NULL)
+                       goto failure;
+       }
 
        // data source settings take precedence over existing ones
-       if (*dsn) {
+       if (dsn && *dsn) {
                error_state = takeSettingsFromDS(settings, dsn);
                if (error_state != NULL)
                        goto failure;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org