MonetDB: default - Merged with Jul2021

[Pedro Ferreira]

Changeset: dfeedb60f298 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/dfeedb60f298
Modified Files:
        gdk/gdk_utils.c
Branch: default
Log Message:

Merged with Jul2021


diffs (33 lines):

diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -945,7 +945,6 @@ GDKinit(opt *set, int setlen, bool embed
                        TRC_CRITICAL(GDK, "mnstr_init failed\n");
                        return GDK_FAIL;
                }
-               first = false;
        } else {
                /* BBP was locked by BBPexit() */
                BBPunlock();
@@ -996,6 +995,7 @@ GDKinit(opt *set, int setlen, bool embed
        GDK_mem_maxsize = (size_t) ((double) MT_npages() * (double) 
MT_pagesize() * 0.815);
        if (BBPinit(first) != GDK_SUCCEED)
                return GDK_FAIL;
+       first = false;
 
        if (GDK_mem_maxsize / 16 < GDK_mmap_minsize_transient) {
                GDK_mmap_minsize_transient = GDK_mem_maxsize / 16;
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
@@ -396,7 +396,9 @@ JSONjson2str(str *ret, json *j)
 static str
 JSON2json(json *ret, const json *j)
 {
-       *ret = *j;
+       *ret = GDKstrdup(*j);
+       if (*ret == NULL)
+               throw(MAL, "json.json", SQLSTATE(HY013) MAL_MALLOC_FAIL);
        return MAL_SUCCEED;
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list