Changeset: 16ce60814efe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/16ce60814efe
Modified Files:
sql/storage/bat/bat_storage.c
Branch: Jul2021
Log Message:
Look for errors
diffs (25 lines):
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -1578,8 +1578,8 @@ delta_append_bat(sql_trans *tr, sql_delt
assert(!offsets || BATcount(offsets) == BATcount(i));
if (!BATcount(i))
return LOG_OK;
- if (i && (i->ttype == TYPE_msk || mask_cand(i)))
- oi = BATunmask(i);
+ if ((i->ttype == TYPE_msk || mask_cand(i)) && !(oi = BATunmask(i)))
+ return LOG_ERR;
lock_column(tr->store, id);
b = temp_descriptor(bat->cs.bid);
@@ -1803,8 +1803,8 @@ storage_delete_bat(sql_trans *tr, sql_ta
BAT *oi = i; /* update ids */
int ok = LOG_OK;
- if (i->ttype == TYPE_msk || mask_cand(i))
- i = BATunmask(i);
+ if ((i->ttype == TYPE_msk || mask_cand(i)) && !(i = BATunmask(i)))
+ return LOG_ERR;
if (BATcount(i)) {
if (BATtdense(i)) {
size_t start = i->tseqbase;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
