MonetDB: Oct2020 - Look for optional candidate list

[Pedro Ferreira]

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

Look for optional candidate list


diffs (16 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
@@ -1049,9 +1049,10 @@ CMDconvertbat(MalStkPtr stk, InstrPtr pc
                        BBPunfix(b->batCacheid);
                        throw(MAL, "batcalc.convert", SQLSTATE(HY002) 
RUNTIME_OBJECT_MISSING);
                }
-               if (ATOMtype(s->ttype) != TYPE_oid) {
+               if (s && ATOMtype(s->ttype) != TYPE_oid) {
                        BBPunfix(b->batCacheid);
-                       BBPunfix(s->batCacheid);
+                       if (s)
+                               BBPunfix(s->batCacheid);
                        throw(MAL, "batcalc.convert", SQLSTATE(42000) 
ILLEGAL_ARGUMENT);
                }
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list