MonetDB: Jul2017 - Merge with Dec2016 branch.

[Sjoerd Mullender]

Changeset: 169cec0e6e9b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=169cec0e6e9b
Modified Files:
        common/utils/msabaoth.c
        monetdb5/modules/atoms/inet.c
Branch: Jul2017
Log Message:

Merge with Dec2016 branch.


diffs (78 lines):

diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -1207,12 +1207,12 @@ msab_deserialise(sabdb **ret, char *sdb)
        /* fill/create sabdb struct */
 
        if (protover == '1') {
-               if ((dbname = strrchr(dbname, '/')) == NULL) {
+               if ((p = strrchr(dbname, '/')) == NULL) {
                        free(u);
                        snprintf(buf, sizeof(buf), "invalid path: %s", dbname);
                        return(strdup(buf));
                }
-               dbname++;
+               dbname = p + 1;
        }
 
        s = malloc(sizeof(sabdb));
diff --git a/monetdb5/modules/atoms/inet.c b/monetdb5/modules/atoms/inet.c
--- a/monetdb5/modules/atoms/inet.c
+++ b/monetdb5/modules/atoms/inet.c
@@ -229,9 +229,9 @@ INETtoString(str *retval, int *len, cons
 {
        const inet *value = (const inet *)handle;
 
-       if (*len < 19 || *retval == NULL) {
+       if (*len < 20 || *retval == NULL) {
                GDKfree(*retval);
-               *retval = GDKmalloc(sizeof(char) * (*len = 19));
+               *retval = GDKmalloc(sizeof(char) * (*len = 20));
                if( *retval == NULL)
                        return 0;
        }
@@ -699,11 +699,11 @@ INETtext(str *retval, const inet *val)
        if (in_isnil(val)) {
                *retval = GDKstrdup(str_nil);
        } else {
-               ip = GDKmalloc(sizeof(char) * 19);
+               ip = GDKmalloc(sizeof(char) * 20);
                if( ip == NULL)
                        throw(MAL,"INETtext",MAL_MALLOC_FAIL);
 
-               snprintf(ip, sizeof(char) * 19, "%d.%d.%d.%d/%d",
+               snprintf(ip, sizeof(char) * 20, "%d.%d.%d.%d/%d",
                                val->q1, val->q2, val->q3, val->q4, val->mask);
                *retval = ip;
        }
@@ -752,23 +752,24 @@ INETabbrev(str *retval, const inet *val)
                 * &:    00 00 00 00
                 * all zero, thus no bits on the right side of the mask
                 */
-               ip = GDKmalloc(sizeof(char) * 19);
+
+               ip = GDKmalloc(sizeof(char) * 20);
                if (ip == NULL)
                        throw(MAL, "inet.abbrev", MAL_MALLOC_FAIL);
 
                if (msk > 24) {
-                       snprintf(ip, sizeof(char) * 19, "%d.%d.%d.%d/%d",
+                       snprintf(ip, sizeof(char) * 20, "%d.%d.%d.%d/%d",
                                         val->q1, val->q2, val->q3, val->q4, 
val->mask);
                } else if (msk > 16) {
-                       snprintf(ip, sizeof(char) * 19, "%d.%d.%d/%d",
+                       snprintf(ip, sizeof(char) * 20, "%d.%d.%d/%d",
                                         val->q1, val->q2, val->q3, val->mask);
                } else if (msk > 8) {
-                       snprintf(ip, sizeof(char) * 19, "%d.%d/%d",
+                       snprintf(ip, sizeof(char) * 20, "%d.%d/%d",
                                         val->q1, val->q2, val->mask);
                } else if (msk > 0) {
-                       snprintf(ip, sizeof(char) * 19, "%d/%d", val->q1, 
val->mask);
+                       snprintf(ip, sizeof(char) * 20, "%d/%d", val->q1, 
val->mask);
                } else {
-                       snprintf(ip, sizeof(char) * 19, "/0");
+                       snprintf(ip, sizeof(char) * 20, "/0");
                }
 
                *retval = ip;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list