Changeset: 578ff13cce76 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/578ff13cce76
Modified Files:
sql/backends/monet5/sql.c
Branch: Dec2023
Log Message:
VALempty after releasing bat from stack, fixing batUnfix errors
diffs (22 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -4844,14 +4844,16 @@ SQLunionfunc(Client cntxt, MalBlkPtr mb,
i=1;
for (ii = 0; i < pci->retc &&
!ret; ii++, i++) {
BAT *b;
-
- if (!(b =
BATdescriptor(omb?env->stk[q->argv[ii]].val.bval:nstk->stk[q->argv[ii]].val.bval)))
+ ValPtr vp = omb ?
env->stk + q->argv[ii] : nstk->stk + q->argv[ii];
+
+ if (!(b =
BATdescriptor(vp->val.bval)))
ret =
createException(MAL, "sql.unionfunc", SQLSTATE(HY005) "Cannot access column
descriptor");
else if
(BATappend(res[i], b, NULL, FALSE) != GDK_SUCCEED)
ret =
createException(MAL, "sql.unionfunc", GDK_EXCEPTION);
if (b) {
BBPrelease(b->batCacheid); /* release ref from env stack */
BBPunfix(b->batCacheid); /* free pointer */
+ VALempty(vp);
}
}
}
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
