MonetDB: Aug2018 - Don't crash on query CREATE TABLE mytable FRO...

[Sjoerd Mullender]

Changeset: 59538edd0f12 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=59538edd0f12
Modified Files:
        sql/server/rel_psm.c
Branch: Aug2018
Log Message:

Don't crash on query CREATE TABLE mytable FROM LOADER non_existing_loader();


diffs (15 lines):

diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -1495,7 +1495,10 @@ rel_psm(mvc *sql, symbol *s)
            dlist *qname = l->h->data.lval;
            symbol *sym = l->h->next->data.sym;
 
-           ret = rel_psm_stmt(sql->sa, exp_rel(sql, 
create_table_from_loader(sql, qname, sym)));
+           ret = create_table_from_loader(sql, qname, sym);
+           if (ret == NULL)
+                   return NULL;
+           ret = rel_psm_stmt(sql->sa, exp_rel(sql, ret));
            sql->type = Q_SCHEMA;
        }       break;
        case SQL_CREATE_TRIGGER:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list