Changeset: 99160c62f433 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/99160c62f433
Modified Files:
monetdb5/optimizer/opt_mergetable.c
sql/backends/monet5/UDF/capi/capi.c
Branch: Sep2022
Log Message:
Trying to help coverity.
diffs (51 lines):
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -419,7 +419,8 @@ mat_apply1(MalBlkPtr mb, InstrPtr p, mat
is_assign = (n >= 0);
}
- if((r = newInstructionArgs(mb, matRef, packRef, mat[m].mi->argc)) ==
NULL)
+ if(m < 0 ||
+ (r = newInstructionArgs(mb, matRef, packRef, mat[m].mi->argc)) ==
NULL)
return -1;
getArg(r, 0) = getArg(p,0);
tpe = getArgType(mb,p,0);
@@ -490,6 +491,7 @@ mat_apply(MalBlkPtr mb, InstrPtr p, matl
return mat_apply1(mb, p, ml, is_a_mat(getArg(p,1),ml), 1);
assert(nrmats <= 8);
+ assert(p->retc < p->argc); /* i.e. matvar[0] gets initialized */
for(k=p->retc, l=0; k < p->argc; k++) {
int mv = is_a_mat(getArg(p,k), ml);
if (mv >=0) {
diff --git a/sql/backends/monet5/UDF/capi/capi.c
b/sql/backends/monet5/UDF/capi/capi.c
--- a/sql/backends/monet5/UDF/capi/capi.c
+++ b/sql/backends/monet5/UDF/capi/capi.c
@@ -473,7 +473,7 @@ static str CUDFeval(Client cntxt, MalBlk
lng initial_output_count = -1;
- struct sigaction sa, oldsa, oldsb;
+ struct sigaction sa = (struct sigaction) {.sa_flags = 0}, oldsa, oldsb;
sigset_t signal_set;
#ifdef NDEBUG
@@ -526,8 +526,6 @@ static str CUDFeval(Client cntxt, MalBlk
(void)sigaddset(&signal_set, SIGSEGV);
(void)sigaddset(&signal_set, SIGBUS);
(void)pthread_sigmask(SIG_UNBLOCK, &signal_set, NULL);
-
- sa = (struct sigaction) {.sa_flags = 0,};
}
sqlfun = *(sql_func **)getArgReference_ptr(stk, pci, pci->retc);
@@ -1400,7 +1398,7 @@ static str CUDFeval(Client cntxt, MalBlk
errno = 0;
goto wrapup;
}
- sa = (struct sigaction) {.sa_flags = 0,};
+ sa = (struct sigaction) {.sa_flags = 0};
}
if (msg) {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
