MonetDB: Apr2019 - Add some NULL pointer checks.

[Sjoerd Mullender]

Changeset: 1e37ef106d52 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e37ef106d52
Modified Files:
        sql/backends/monet5/rel_bin.c
        sql/server/rel_optimizer.c
Branch: Apr2019
Log Message:

Add some NULL pointer checks.


diffs (49 lines):

diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -5524,8 +5524,11 @@ output_rel_bin(backend *be, sql_rel *rel
        mvc *sql = be->mvc;
        list *refs = sa_list(sql->sa);
        int sqltype = sql->type;
-       stmt *s = _subrel_bin(be, rel, refs);
-
+       stmt *s;
+
+       if (refs == NULL)
+               return NULL;
+       s = _subrel_bin(be, rel, refs);
        if (sqltype == Q_SCHEMA)
                sql->type = sqltype;  /* reset */
 
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -4568,6 +4568,8 @@ rel_push_semijoin_down(int *changes, mvc
                list *exps = rel->exps, *nexps = sa_list(sql->sa);
                node *n;
 
+               if (nexps == NULL)
+                       return NULL;
                for(n = exps->h; n; n = n->next) {
                        sql_exp *sje = n->data;
 
@@ -6751,6 +6753,8 @@ rel_dce(mvc *sql, sql_rel *rel)
        list *refs = sa_list(sql->sa);
        node *n;
 
+       if (refs == NULL)
+               return NULL;
        if (sql->sqs) {
                node *n;
 
@@ -6988,7 +6992,9 @@ rel_simplify_like_select(int *changes, m
        if (is_select(rel->op) && rel->exps) {
                node *n;
                list *exps = sa_list(sql->sa);
-                       
+
+               if (exps == NULL)
+                       return NULL;
                for (n = rel->exps->h; n; n = n->next) {
                        sql_exp *e = n->data;
                        list *l = e->l;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list