From 4324ffae03cf741f5b80dc34803f6bffb44176fd Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Tue, 25 Oct 2022 14:05:08 -0700
Subject: [PATCH] safely close db when cps fails

---
 peer/cwtchprofilestorage.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/peer/cwtchprofilestorage.go b/peer/cwtchprofilestorage.go
index 8769b42..e7cca3f 100644
--- a/peer/cwtchprofilestorage.go
+++ b/peer/cwtchprofilestorage.go
@@ -124,66 +124,77 @@ func NewCwtchProfileStorage(db *sql.DB, profileDirectory string) (*CwtchProfileS
 
 	insertProfileKeyValueStmt, err := db.Prepare(insertProfileKeySQLStmt)
 	if err != nil {
+		db.Close()
 		log.Errorf("error preparing query: %v %v", insertProfileKeySQLStmt, err)
 		return nil, err
 	}
 
 	selectProfileKeyStmt, err := db.Prepare(selectProfileKeySQLStmt)
 	if err != nil {
+		db.Close()
 		log.Errorf("error preparing query: %v %v", selectProfileKeySQLStmt, err)
 		return nil, err
 	}
 
 	findProfileKeyStmt, err := db.Prepare(findProfileKeySQLStmt)
 	if err != nil {
+		db.Close()
 		log.Errorf("error preparing query: %v %v", findProfileKeySQLStmt, err)
 		return nil, err
 	}
 
 	insertConversationStmt, err := db.Prepare(insertConversationSQLStmt)
 	if err != nil {
+		db.Close()
 		log.Errorf("error preparing query: %v %v", insertConversationSQLStmt, err)
 		return nil, err
 	}
 
 	fetchAllConversationsStmt, err := db.Prepare(fetchAllConversationsSQLStmt)
 	if err != nil {
+		db.Close()
 		log.Errorf("error preparing query: %v %v", fetchAllConversationsSQLStmt, err)
 		return nil, err
 	}
 
 	selectConversationStmt, err := db.Prepare(selectConversationSQLStmt)
 	if err != nil {
+		db.Close()
 		log.Errorf("error preparing query: %v %v", selectConversationSQLStmt, err)
 		return nil, err
 	}
 
 	selectConversationByHandleStmt, err := db.Prepare(selectConversationByHandleSQLStmt)
 	if err != nil {
+		db.Close()
 		log.Errorf("error preparing query: %v %v", selectConversationByHandleSQLStmt, err)
 		return nil, err
 	}
 
 	acceptConversationStmt, err := db.Prepare(acceptConversationSQLStmt)
 	if err != nil {
+		db.Close()
 		log.Errorf("error preparing query: %v %v", acceptConversationSQLStmt, err)
 		return nil, err
 	}
 
 	deleteConversationStmt, err := db.Prepare(deleteConversationSQLStmt)
 	if err != nil {
+		db.Close()
 		log.Errorf("error preparing query: %v %v", deleteConversationSQLStmt, err)
 		return nil, err
 	}
 
 	setConversationAttributesStmt, err := db.Prepare(setConversationAttributesSQLStmt)
 	if err != nil {
+		db.Close()
 		log.Errorf("error preparing query: %v %v", setConversationAttributesSQLStmt, err)
 		return nil, err
 	}
 
 	setConversationACLStmt, err := db.Prepare(setConversationACLSQLStmt)
 	if err != nil {
+		db.Close()
 		log.Errorf("error preparing query: %v %v", setConversationACLSQLStmt, err)
 		return nil, err
 	}