Changeset: f116bb0d6478 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f116bb0d6478
Modified Files:
sql/storage/bat/bat_storage.c
Branch: Jul2021
Log Message:
Check for errors (NULL pointers) before dereferencing them.
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
@@ -554,8 +554,8 @@ find_tmp_idx(sql_trans *tr, sql_idx *i)
static sql_delta *
temp_col_timestamp_delta( sql_trans *tr, sql_column *c)
{
- if (isGlobal(c->t))
- c = find_tmp_column(tr, c);
+ if (isGlobal(c->t) && (c = find_tmp_column(tr, c)) == NULL)
+ return NULL;
assert (!isGlobal(c->t));
assert(isTempTable(c->t));
sql_delta *d = temp_delta(ATOMIC_PTR_GET(&c->data), tr->tid);
@@ -615,8 +615,8 @@ timestamp_storage( sql_trans *tr, storag
static storage *
temp_tab_timestamp_storage( sql_trans *tr, sql_table *t)
{
- if (isGlobal(t))
- t = find_tmp_table(tr, t);
+ if (isGlobal(t) && (t = find_tmp_table(tr, t)) == NULL)
+ return NULL;
assert(!isGlobal(t));
assert(isTempTable(t));
storage *d = temp_storage(ATOMIC_PTR_GET(&t->data), tr->tid);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
