Changeset: 2b9e249c4fb1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2b9e249c4fb1
Modified Files:
        gdk/gdk_bbp.c
Branch: Dec2025
Log Message:

Fix incorrect call to GDKfree.


diffs (25 lines):

diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1515,6 +1515,8 @@ jsonupgradebat(BAT *b, json_storage_conv
                var_t o = ((var_t *) h1.base)[i];
                const char *s = vh1.base + o;
                char *ns;
+               allocator *ta = MT_thread_getallocator();
+               allocator_state ta_state = ma_open(ta);
                if (fixJSONStorage(&ns, &s) != GDK_SUCCEED) {
                        HEAPfree(&h1, false);
                        HEAPfree(&vh1, false);
@@ -1523,10 +1525,11 @@ jsonupgradebat(BAT *b, json_storage_conv
                        b->tvheap = ovh;
                        TRC_CRITICAL(GDK, "converting value "
                                     "in BAT %d failed\n", b->batCacheid);
+                       ma_close(&ta_state);
                        return GDK_FAIL;
                }
                var_t no = strPut(b, &o, ns);
-               GDKfree(ns);
+               ma_close(&ta_state);
                if (no == (var_t) -1) {
                        HEAPfree(&h1, false);
                        HEAPfree(&vh1, false);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to