Hotfix for rare panic caused by uninitialized mutex

decred · Feb 18, 2016 · 76bd7bd · 76bd7bd
1 parent 93408e9
commit 76bd7bd
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/wallet/addresspool.go b/wallet/addresspool.go
@@ -41,7 +41,7 @@ type addressPool struct {
 	branch    uint32
 	index     uint32
 	started   bool
-	mutex     *sync.Mutex
+	mutex     sync.Mutex
 	wallet    *Wallet
 }
 
@@ -95,7 +95,6 @@ func (a *addressPool) initialize(branch uint32, w *Wallet) error {
 	}
 
 	a.addresses = make([]string, 0)
-	a.mutex = new(sync.Mutex)
 	a.wallet = w
 	a.branch = branch
 
@@ -296,12 +295,6 @@ func (w *Wallet) CloseAddressPools() {
 	if !w.internalPool.started || !w.externalPool.started {
 		return
 	}
-	if w.internalPool.mutex == nil {
-		return
-	}
-	if w.externalPool.mutex == nil {
-		return
-	}
 
 	w.internalPool.mutex.Lock()
 	w.externalPool.mutex.Lock()