MonetDB: Jun2020 - Handle empty strings correctly in JSONkeyArray

[Panagiotis Koutsourakis]

Changeset: e5f5ab2d3769 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e5f5ab2d3769
Modified Files:
        monetdb5/modules/atoms/json.c
Branch: Jun2020
Log Message:

Handle empty strings correctly in JSONkeyArray

This fixes Bug 6858


diffs (17 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
@@ -1518,6 +1518,13 @@ JSONkeyArray(json *ret, json *js)
                        }
                        if (jt->elm[i].valuelen)
                                strncpy(r, jt->elm[i].value - 1, 
jt->elm[i].valuelen + 2);
+                       else {
+                               r = GDKstrdup("\"\"");
+                               if(r == NULL) {
+                                       JSONfree(jt);
+                                       goto memfail;
+                               }
+                       }
                        result = JSONglue(result, r, ',');
                        if (result == NULL) {
                                JSONfree(jt);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list