...

Author: Mathew

src/core/db.cpp

@@ -86,6 +86,15 @@ db_details* db_get_details() {
 	return &db;
 }
 
+static khiter_t db_table_find_slot(const db_table* target) {
+	for (khiter_t k = kh_begin(db.tables); k != kh_end(db.tables); ++k) {
+		if (kh_exist(db.tables, k) && kh_val(db.tables, k) == target) {
+			return k;
+		}
+	}
+	return kh_end(db.tables);
+}
+
 #ifdef DEBUG_BUILD
 void db_validate_lru_flags() {
 	for (khiter_t k = kh_begin(db.tables); k != kh_end(db.tables); ++k) {
@@ -269,11 +278,16 @@ void db_table_actually_delete(db_table* entry) {
 	DEBUG("[#] Cleaning up table due to refcount == 0\n");
 
 	//Remove table from database
-	khiter_t k = kh_get(table, db.tables, entry->hash);
+	khiter_t k = db_table_find_slot(entry);
 	if (k != kh_end(db.tables)) {
 		kh_del(table, db.tables, k);
 	}
 
+	if (entry->cache_hash_set != NULL) {
+		kh_destroy(entry, entry->cache_hash_set);
+		entry->cache_hash_set = NULL;
+	}
+
 	//Free key
 	free(entry->key);
 	free(entry);
@@ -703,18 +717,20 @@ static bool db_load_from_save(){
 					// Test file existance
 					get_key_path(entry, buffer);
 
-					if( access( buffer, F_OK ) == -1 ) {
-						DEBUG("skipping as file %s does not exist\n", buffer);
-						free(entry);
-						continue;
-					}
-				}else{
+						if( access( buffer, F_OK ) == -1 ) {
+							DEBUG("skipping as file %s does not exist\n", buffer);
+							free(entry->key);
+							free(entry);
+							continue;
+						}
+					}else{
 					// Test size of blockfile
-					if((uint32_t)d1 >= db.blocks_exist){
-						DEBUG("skipping as block %d does not exist\n", d1);
-						free(entry);
-						continue;
-					}
+						if((uint32_t)d1 >= db.blocks_exist){
+							DEBUG("skipping as block %d does not exist\n", d1);
+							free(entry->key);
+							free(entry);
+							continue;
+						}
 					// Mark this block as in-use
 					if (block_in_use != NULL) {
 						block_in_use[d1 / 8] |= (1 << (d1 % 8));
@@ -1274,6 +1290,7 @@ bool db_entry_handle_delete(cache_entry* entry) {
 void db_delete_table_entry(db_table* table, khiter_t k, bool actually_delete = true) {
 	// Clear key hash table
 	kh_destroy(entry, table->cache_hash_set);
+	table->cache_hash_set = NULL;
 
 	// If not fully de-refed remove now, not later
 	if (table->refs != 0) {
@@ -1309,7 +1326,7 @@ void db_table_handle_delete(db_table* table, khiter_t k) {
 
 
 void db_table_handle_delete(db_table* table) {
-	khiter_t k = kh_get(table, db.tables, table->hash);
+	khiter_t k = db_table_find_slot(table);
 
 	return db_table_handle_delete(table, k);
 }
@@ -1339,15 +1356,15 @@ bool db_entry_handle_delete(cache_entry* entry, khiter_t k) {
 	//If table entry, cleanup table
 	if (kh_size(entry->table->cache_hash_set) == 0) {
 		// Release the reference taken when the table transitioned from empty
-		// to non-empty. db_delete_table_entry() will release the remaining
-		// table ownership reference.
-		db_table_deref(entry->table);
-		assert(!entry->table->deleted);
-		entry->table->deleted = true;
-		k = kh_get(table, db.tables, entry->table->hash);
-		assert (k != kh_end(db.tables));
-		db_delete_table_entry(entry->table, k, true);
-		entry->table = NULL;
+			// to non-empty. db_delete_table_entry() will release the remaining
+			// table ownership reference.
+			db_table_deref(entry->table);
+			assert(!entry->table->deleted);
+			entry->table->deleted = true;
+			k = db_table_find_slot(entry->table);
+			assert (k != kh_end(db.tables));
+			db_delete_table_entry(entry->table, k, true);
+			entry->table = NULL;
 		db_entry_deref(entry, false);
 		return true;
 	}