cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #2192 from filecoin-project/fix/evnts-map-pnc

Browse Source 
Fix concurrent map access panic in event API
This commit is contained in:
Łukasz Magiera 2020-07-01 10:36:29 +02:00 committed by GitHub
commit 92f392d422
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chain/events/events_called.go
View File

@ -443,8 +443,8 @@ func (we *watcherEvents) StateChanged(check CheckFunc, scHnd StateChangeHandler,
} }
we.lk.Lock() we.lk.Lock()
we.matchers[id] = mf
defer we.lk.Unlock() defer we.lk.Unlock()
we.matchers[id] = mf
return nil return nil
} }
@ -476,10 +476,11 @@ func (me *messageEvents) checkNewCalls(ts *types.TipSet) (map[triggerID]eventDat
return nil, err return nil, err
} }
res := make(map[triggerID]eventData)
me.messagesForTs(pts, func(msg *types.Message) {
me.lk.RLock() me.lk.RLock()
defer me.lk.RUnlock() defer me.lk.RUnlock()
res := make(map[triggerID]eventData)
me.messagesForTs(pts, func(msg *types.Message) {
// TODO: provide receipts // TODO: provide receipts
for tid, matchFns := range me.matchers { for tid, matchFns := range me.matchers {