Changeset: 769c22405ec8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=769c22405ec8
Modified Files:
sql/storage/store.c
Branch: Jun2020
Log Message:
small fix/cleanup (make sure we don't access a possible null pointer)
diffs (23 lines):
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1855,18 +1855,17 @@ store_load(backend_stack stk) {
if (store_readonly)
return -1;
tr = sql_trans_create(stk, NULL, NULL, true);
- tr->active = 1;
if (!tr) {
TRC_CRITICAL(SQL_STORE, "Failed to start a transaction
while loading the storage\n");
return -1;
}
} else {
- tr->active = 1;
if (!(store_oids = GDKzalloc(300 * sizeof(sqlid)))) { /* 150
suffices */
TRC_CRITICAL(SQL_STORE, "Allocation failure while
loading the storage\n");
return -1;
}
}
+ tr->active = 1;
s = bootstrap_create_schema(tr, "sys", ROLE_SYSADMIN, USER_MONETDB);
if (!first)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
