Changeset: 0f24758e14b6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f24758e14b6
Modified Files:
        monetdb5/modules/mal/batcalc.c
Branch: Jun2020
Log Message:

Check all candidate list parameters for nil.


diffs (18 lines):

diff --git a/monetdb5/modules/mal/batcalc.c b/monetdb5/modules/mal/batcalc.c
--- a/monetdb5/modules/mal/batcalc.c
+++ b/monetdb5/modules/mal/batcalc.c
@@ -1144,9 +1144,11 @@ CMDbatBETWEEN(Client cntxt, MalBlkPtr mb
                if (tp != TYPE_bat && !isaBatType(tp))
                        goto bailout;
                bid = *getArgReference_bat(stk, pci, 4 + bc);
-               shi = BATdescriptor(bid);
-               if (shi == NULL)
-                       goto bailout;
+               if (is_bat_nil(bid)) {
+                       shi = BATdescriptor(bid);
+                       if (shi == NULL)
+                               goto bailout;
+               }
                bc++;
        }
        tp = getArgType(mb, pci, 4 + bc);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to