MonetDB: default - Less crashes please

[Pedro Ferreira]

Changeset: 817eb3891c9d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=817eb3891c9d
Modified Files:
        sql/server/rel_schema.c
        sql/server/sql_atom.c
        sql/server/sql_semantic.c
        sql/server/sql_var.c
Branch: default
Log Message:

Less crashes please


diffs (61 lines):

diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -477,7 +477,6 @@ column_options(sql_query *query, dlist *
                                        r = symbol2string(sql, s->data.sym, 0, 
&err);
                                        if (!r) {
                                                (void) sql_error(sql, 02, 
SQLSTATE(42000) "Incorrect default value '%s'\n", err?err:"");
-                                               if (err) _DELETE(err);
                                                return SQL_ERR;
                                        } else {
                                                mvc_default(sql, cs, r);
diff --git a/sql/server/sql_atom.c b/sql/server/sql_atom.c
--- a/sql/server/sql_atom.c
+++ b/sql/server/sql_atom.c
@@ -326,7 +326,6 @@ atom_general(sql_allocator *sa, sql_subt
 
                        /* no result or nil means error (SQL has NULL not nil) 
*/
                        if (res < 0 || !p || ATOMcmp(type, p, ATOMnilptr(type)) 
== 0) {
-                               /*_DELETE(val);*/
                                if (p)
                                        GDKfree(p);
                                return NULL;
@@ -345,7 +344,6 @@ atom_general(sql_allocator *sa, sql_subt
                                a->data.val.lval *= d;
                        }
                        GDKfree(p);
-                       /*_DELETE(val);*/
                }
        } else {
                VALset(&a->data, a->data.vtype, (ptr) 
ATOMnilptr(a->data.vtype));
diff --git a/sql/server/sql_semantic.c b/sql/server/sql_semantic.c
--- a/sql/server/sql_semantic.c
+++ b/sql/server/sql_semantic.c
@@ -325,8 +325,6 @@ char *
                if ((res = NEW_ARRAY(char, strlen(sname) + strlen(op) + 
strlen(l) + strlen(r) + 9)))
                        
stpcpy(stpcpy(stpcpy(stpcpy(stpcpy(stpcpy(stpcpy(stpcpy(stpcpy(res, "\""), 
sname), "\".\""), op), "\"("), l), ","), r), ")");
 
-               _DELETE(l);
-               _DELETE(r);
                return res;
        } break;
        case SQL_OP: {
diff --git a/sql/server/sql_var.c b/sql/server/sql_var.c
--- a/sql/server/sql_var.c
+++ b/sql/server/sql_var.c
@@ -145,13 +145,10 @@ frame_push_table(mvc *sql, sql_table *t)
                return NULL;
        slt->table = t;
        t->s = NULL;
-       if (!f->tables && !(f->tables = list_create(NULL))) {
+       if (!f->tables && !(f->tables = list_create(NULL)))
                return NULL;
-       }
-       if (!list_append(f->tables, slt)) {
-               _DELETE(slt);
+       if (!list_append(f->tables, slt))
                return NULL;
-       }
        return slt;
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list