MonetDB: odbc-tls - unix_sock_name_buffer can be NULL

[Joeri van Ruth via checkin-list]

Changeset: 61eea1cb05bb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/61eea1cb05bb
Modified Files:
        clients/mapilib/msettings.c
Branch: odbc-tls
Log Message:

unix_sock_name_buffer can be NULL


diffs (15 lines):

diff --git a/clients/mapilib/msettings.c b/clients/mapilib/msettings.c
--- a/clients/mapilib/msettings.c
+++ b/clients/mapilib/msettings.c
@@ -261,8 +261,9 @@ msettings *msettings_clone(const msettin
 {
        msettings *mp = malloc(sizeof(*mp));
        char **unknowns = calloc(2 * orig->nr_unknown, sizeof(char*));
-       char *cloned_name_buffer = strdup(orig->unix_sock_name_buffer);
-       if (!mp || !unknowns || !cloned_name_buffer) {
+       const char *namebuf = orig->unix_sock_name_buffer;
+       char *cloned_name_buffer = namebuf ? strdup(namebuf) : NULL;
+       if (!mp || !unknowns || (namebuf && !cloned_name_buffer)) {
                free(mp);
                free(unknowns);
                free(cloned_name_buffer);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org