Changeset: bb5ee7c69755 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb5ee7c69755
Modified Files:
monetdb5/modules/mal/clients.c
Branch: Nov2019
Log Message:
Avoid assertions when exceptions can be thrown
diffs (13 lines):
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -53,7 +53,8 @@ str
CLTgetClientId(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
(void) mb;
- assert(cntxt - mal_clients <= INT_MAX);
+ if(cntxt - mal_clients < 0 || cntxt - mal_clients >= MAL_MAXCLIENTS)
+ throw(MAL, "clients.getClientId", "Illegal client index");
*getArgReference_int(stk,pci,0) = (int) (cntxt - mal_clients);
return MAL_SUCCEED;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
