Changeset: 28bba08bf2f3 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=28bba08bf2f3 Modified Files: monetdb5/modules/mal/mal_weld.c Branch: rel-weld Log Message:
fix inputStruct size diffs (12 lines): diff --git a/monetdb5/modules/mal/mal_weld.c b/monetdb5/modules/mal/mal_weld.c --- a/monetdb5/modules/mal/mal_weld.c +++ b/monetdb5/modules/mal/mal_weld.c @@ -317,7 +317,7 @@ WeldRun(Client cntxt, MalBlkPtr mb, MalS /* Prepare the input for Weld. We're building an array that has the layout of a struct */ /* Max possible size is when we only have string bats: 2 ptrs for theap and tvheap and 4 lngs * for batCount, hseqbase, stroffset and tvheap->size. */ - char *inputStruct = malloc((pci->argc - pci->retc) * (2 * sizeof(void *) + 3 * sizeof(lng))); + char *inputStruct = malloc((pci->argc - pci->retc) * (2 * sizeof(void *) + 3 * sizeof(lng)) + 20 * sizeof(void*)); char *inputPtr = inputStruct; for (i = pci->retc + 2; i < pci->argc; i++) { /* skip wstate and names */ int type = getArgType(mb, pci, i); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list