MonetDB: default - Merged with Oct2020

[Pedro Ferreira]

Changeset: caa84a73805b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/caa84a73805b
Modified Files:
        gdk/gdk_atoms.c
        monetdb5/modules/atoms/json.c
        monetdb5/modules/atoms/uuid.c
        monetdb5/modules/mal/mal_mapi.c
Branch: default
Log Message:

Merged with Oct2020


diffs (57 lines):

diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -955,8 +955,10 @@ hgeToStr(char **dst, size_t *len, const 
        atommem(hgeStrlen);
        if (is_hge_nil(*src)) {
                if (external) {
-                       return (ssize_t) strcpy_len(*dst, "nil", 4);
+                       assert(*len >= strlen("nil") + 1);
+                       return (ssize_t) strcpy(*dst, "nil");
                }
+               assert(*len >= strlen(str_nil) + 1);
                strcpy(*dst, str_nil);
                return 1;
        }
@@ -1360,9 +1362,11 @@ UUIDtoString(str *retval, size_t *len, c
        }
        if (is_uuid_nil(*value)) {
                if (external) {
-                       return (ssize_t) strcpy_len(*retval, "nil", 4);
-               }
-               return (ssize_t) strcpy_len(*retval, str_nil, 2);
+                       assert(*len >= strlen("nil") + 1);
+                       return (ssize_t) strcpy(*retval, "nil");
+               }
+               assert(*len >= strlen(str_nil) + 1);
+               return (ssize_t) strcpy(*retval, str_nil);
        }
 #ifdef HAVE_UUID
        uuid_unparse_lower(value->u, *retval);
diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -185,8 +185,10 @@ JSONtoString(str *s, size_t *len, const 
                                return -1;
                }
                if (external) {
-                       return (ssize_t) strcpy_len(*s, "nil", 4);
+                       assert(*len >= strlen("nil") + 1);
+                       return (ssize_t) strcpy(*s, "nil");
                }
+               assert(*len >= strlen(str_nil) + 1);
                strcpy(*s, str_nil);
                return 1;
        }
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -640,7 +640,7 @@ SERVERlisten(int port, const char *usock
 
        const char *listenaddr = port < 0 ? "none" : 
GDKgetenv("mapi_listenaddr");
 
-       if (strNil(usockfile)) {
+       if (strNil(usockfile) || *usockfile == '\0') {
                usockfile = NULL;
 #ifndef HAVE_SYS_UN_H
        } else {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list