Changeset: 5d64903e1790 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5d64903e1790
Modified Files:
gdk/gdk_heap.c
monetdb5/mal/mal.h
monetdb5/mal/mal_profiler.c
Branch: default
Log Message:
Merge with Sep2022 branch.
diffs (67 lines):
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -95,8 +95,7 @@ HEAPgrow(Heap **hp, size_t size, bool ma
ATOMIC_BASE_TYPE refs = ATOMIC_GET(&(*hp)->refs);
if ((refs & HEAPREFS) == 1) {
- gdk_return rc = HEAPextend((*hp), size, mayshare);
- return rc;
+ return HEAPextend((*hp), size, mayshare);
}
new = GDKmalloc(sizeof(Heap));
if (new != NULL) {
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -427,14 +427,16 @@ prepareMalEvent(Client cntxt, MalBlkPtr
}
cv =
VALformat(&stk->stk[getArg(pci,j)]);
- c = strchr(cv, '>');
- if (c) /* unlikely
that this isn't true */
- *c = 0;
- ok = logadd(&logbuf,
",\"file\":\"%s\"", cv + 1);
- GDKfree(cv);
- if (!ok) {
- BBPunfix(d->batCacheid);
- goto cleanup_and_exit;
+ if (cv) {
+ c = strchr(cv, '>');
+ if (c) /*
unlikely that this isn't true */
+ *c = 0;
+ ok = logadd(&logbuf,
",\"file\":\"%s\"", cv + 1);
+ GDKfree(cv);
+ if (!ok) {
+
BBPunfix(d->batCacheid);
+ goto
cleanup_and_exit;
+ }
}
total += cnt << di.shift;
if (!logadd(&logbuf,
",\"width\":%d", di.width)) {
diff --git a/monetdb5/optimizer/opt_evaluate.c
b/monetdb5/optimizer/opt_evaluate.c
--- a/monetdb5/optimizer/opt_evaluate.c
+++ b/monetdb5/optimizer/opt_evaluate.c
@@ -183,14 +183,20 @@ OPTevaluateImplementation(Client cntxt,
actions++;
cst.vtype = 0;
- VALcopy(&cst, &env->stk[getArg(p, 0)]);
+ if (VALcopy(&cst, &env->stk[getArg(p, 0)]) ==
NULL) {
+ msg =
createException(MAL,"optimizer.evaluate", SQLSTATE(HY013) MAL_MALLOC_FAIL);
+ goto wrapup;
+ }
/* You may not overwrite constants. They may
be used by
* other instructions */
nvar = defConstant(mb, getArgType(mb, p, 0),
&cst);
if( nvar >= 0)
getArg(p,1) = nvar;
if (nvar >= env->stktop) {
- VALcopy(&env->stk[getArg(p, 1)],
&getVarConstant(mb, getArg(p, 1)));
+ if (VALcopy(&env->stk[getArg(p, 1)],
&getVarConstant(mb, getArg(p, 1))) == NULL) {
+ msg =
createException(MAL,"optimizer.evaluate", SQLSTATE(HY013) MAL_MALLOC_FAIL);
+ goto wrapup;
+ }
env->stktop = getArg(p, 1) + 1;
}
alias[getArg(p, 0)] = getArg(p, 1);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
