fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-24 22:32:15 +00:00
Code Issues Projects Releases Wiki Activity

libs/db: Fix the BoltDB Get and Iterator

Browse Source 
BoltDB's accessors will return slices that are only valid for the
lifetime of the transaction.  This adds copies where required to prevent
hard to debug crashes (among other things).
This commit is contained in:
Yawning Angel 2019-06-07 07:26:47 +00:00
parent f46ed4aac8
commit 319ecb3005
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG_PENDING.md
View File

@ -29,3 +29,4 @@
### BUG FIXES: ### BUG FIXES:
- [libs/db] Fixed the BoltDB backend's Batch.Delete implementation (@Yawning) - [libs/db] Fixed the BoltDB backend's Batch.Delete implementation (@Yawning)
- [libs/db] Fixed the BoltDB backend's Get and Iterator implementation (@Yawning)

12
libs/db/boltdb.go
View File

@ -66,7 +66,9 @@ func (bdb *BoltDB) Get(key []byte) (value []byte) {
key = nonEmptyKey(nonNilBytes(key)) key = nonEmptyKey(nonNilBytes(key))
err := bdb.db.View(func(tx *bbolt.Tx) error { err := bdb.db.View(func(tx *bbolt.Tx) error {
b := tx.Bucket(bucket) b := tx.Bucket(bucket)
value = b.Get(key) if v := b.Get(key); v != nil {
value = append([]byte{}, v...)
}
return nil return nil
}) })
if err != nil { if err != nil {
@ -312,12 +314,16 @@ func (itr *boltDBIterator) Next() {
func (itr *boltDBIterator) Key() []byte { func (itr *boltDBIterator) Key() []byte {
itr.assertIsValid() itr.assertIsValid()
return itr.currentKey return append([]byte{}, itr.currentKey...)
} }
func (itr *boltDBIterator) Value() []byte { func (itr *boltDBIterator) Value() []byte {
itr.assertIsValid() itr.assertIsValid()
return itr.currentValue var value []byte
if itr.currentValue != nil {
value = append([]byte{}, itr.currentValue...)
}
return value
} }
func (itr *boltDBIterator) Close() { func (itr *boltDBIterator) Close() {