Changeset: e6f169cbf7a1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e6f169cbf7a1
Modified Files:
monetdb5/mal/mal_instruction.c
Branch: Oct2020
Log Message:
On error, we still need to return the instruction, otherwise there is a leak.
diffs (12 lines):
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -1265,7 +1265,7 @@ pushArgumentId(MalBlkPtr mb, InstrPtr p,
if ((v = newVariable(mb, name, namelen, getAtomIndex(name,
namelen, TYPE_any))) < 0) {
/* set the MAL block to erroneous and simply return
without doing anything */
/* mb->errors already set */
- return NULL;
+ return p;
}
}
return pushArgument(mb, p, v);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
