MonetDB: Dec2016 - Aligned SA_VALcopy with VALcopy.

[Sjoerd Mullender]

Changeset: 2147b292a13a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2147b292a13a
Modified Files:
        sql/server/sql_atom.c
Branch: Dec2016
Log Message:

Aligned SA_VALcopy with VALcopy.


diffs (25 lines):

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
@@ -46,17 +46,17 @@ SA_VALcopy(sql_allocator *sa, ValPtr d, 
        } else if (s->vtype == TYPE_str) {
                d->vtype = TYPE_str;
                d->val.sval = sa_strdup(sa, s->val.sval);
+               if (d->val.sval == NULL)
+                       return NULL;
                d->len = strLen(d->val.sval);
-       } else if (s->vtype == TYPE_bit) {
-               d->vtype = s->vtype;
-               d->len = 1;
-               d->val.btval = s->val.btval;
        } else {
                ptr p = s->val.pval;
 
                d->vtype = s->vtype;
                d->len = ATOMlen(d->vtype, p);
                d->val.pval = sa_alloc(sa, d->len);
+               if (d->val.pval == NULL)
+                       return NULL;
                memcpy(d->val.pval, p, d->len);
        }
        return d;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list