MonetDB: Jul2015 - fixes for crashing in order by handling

[Niels Nes]

Changeset: e922ae6a3178 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e922ae6a3178
Modified Files:
        sql/server/rel_select.c
Branch: Jul2015
Log Message:

fixes for crashing in order by handling


diffs (16 lines):

diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -4587,11 +4587,10 @@ rel_order_by_simple_column_exp(mvc *sql,
        sql_exp *e = NULL;
        dlist *l = column_r->data.lval;
 
-       if (column_r->type == type_int)
+       if (!r || !is_project(r->op) || column_r->type == type_int)
                return NULL;
        assert(column_r->token == SQL_COLUMN && column_r->type == type_list);
 
-       assert(is_project(r->op));
        r = r->l;
        if (!r)
                return e;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list