Merge pull request #10144 from filecoin-project/gstuart/sqlite-leak

fix: eth: plug sqlite leak
filecoin-project · Jan 30, 2023 · 6518122 · 6518122
2 parents 60193a2 + 395cdd7
commit 6518122
Showing 1 changed file with 10 additions and 16 deletions.
diff --git a/chain/ethhashlookup/eth_transaction_hash_lookup.go b/chain/ethhashlookup/eth_transaction_hash_lookup.go
@@ -67,34 +67,28 @@ func (ei *EthTxHashLookup) UpsertHash(txHash ethtypes.EthHash, c cid.Cid) error
 }
 
 func (ei *EthTxHashLookup) GetCidFromHash(txHash ethtypes.EthHash) (cid.Cid, error) {
-	q, err := ei.db.Query("SELECT cid FROM eth_tx_hashes WHERE hash = :hash;", sql.Named("hash", txHash.String()))
-	if err != nil {
-		return cid.Undef, err
-	}
+	row := ei.db.QueryRow("SELECT cid FROM eth_tx_hashes WHERE hash = :hash;", sql.Named("hash", txHash.String()))
 
 	var c string
-	if !q.Next() {
-		return cid.Undef, ErrNotFound
-	}
-	err = q.Scan(&c)
+	err := row.Scan(&c)
 	if err != nil {
+		if err == sql.ErrNoRows {
+			return cid.Undef, ErrNotFound
+		}
 		return cid.Undef, err
 	}
 	return cid.Decode(c)
 }
 
 func (ei *EthTxHashLookup) GetHashFromCid(c cid.Cid) (ethtypes.EthHash, error) {
-	q, err := ei.db.Query("SELECT hash FROM eth_tx_hashes WHERE cid = :cid;", sql.Named("cid", c.String()))
-	if err != nil {
-		return ethtypes.EmptyEthHash, err
-	}
+	row := ei.db.QueryRow("SELECT hash FROM eth_tx_hashes WHERE cid = :cid;", sql.Named("cid", c.String()))
 
 	var hashString string
-	if !q.Next() {
-		return ethtypes.EmptyEthHash, ErrNotFound
-	}
-	err = q.Scan(&hashString)
+	err := row.Scan(&c)
 	if err != nil {
+		if err == sql.ErrNoRows {
+			return ethtypes.EmptyEthHash, ErrNotFound
+		}
 		return ethtypes.EmptyEthHash, err
 	}
 	return ethtypes.ParseEthHash(hashString)