MonetDB: default - Avoid segmentation fault: check before use th...

[Jennie Zhang]

Changeset: 95366652e96d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=95366652e96d
Modified Files:
        sql/server/rel_psm.c
Branch: default
Log Message:

Avoid segmentation fault: check before use the function result

Triggered by the following query:

    create function test () returns table (x int)
        begin declare table a(x int); return t; end;


diffs (12 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
@@ -367,6 +367,8 @@ rel_psm_return( mvc *sql, sql_subtype *r
        if (restype->comp_type)
                ek.card = card_relation;
        res = rel_value_exp2(sql, &rel, return_sym, sql_sel, ek, &is_last);
+       if (!res)
+               return NULL;
        if (ek.card != card_relation && (!res || 
                (res = rel_check_type(sql, restype, res, type_equal)) == NULL))
                return NULL;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list