MonetDB: json-storage - Return the correct length

[Panagiotis Koutsourakis via checkin-list]

Changeset: 274a39b6ea88 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/274a39b6ea88
Modified Files:
        monetdb5/modules/atoms/json.c
Branch: json-storage
Log Message:

Return the correct length


diffs (25 lines):

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
@@ -270,6 +270,7 @@ JSONfromString(const char *src, size_t *
                JSONfree(jt);
                return -1;
        }
+       slen = 0;
        JSONtoStorageString(jt, 0, &buf, &slen);
        JSONfree(jt);
        GDKfree(*j);
@@ -278,11 +279,11 @@ JSONfromString(const char *src, size_t *
                JSONfree(jt);
                return -1;
        }
-       strncpy(*j, buf, slen);
+       strncpy(*j, buf, slen + 1);
        *len = slen + 1;
        GDKfree(buf);
 
-       return (ssize_t) slen;
+       return (ssize_t) slen + 1;
 }
 
 static ssize_t
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org