Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
client
Commits
6713f7c2
Commit
6713f7c2
authored
2 years ago
by
Jake Taylor
Browse files
Options
Downloads
Patches
Plain Diff
attempt to fix mutex segfault in HandleReceivedRequest
parent
b54fe9e3
No related branches found
No related tags found
3 merge requests
!510
Release
,
!365
attempt to fix mutex segfault in HandleReceivedRequest
,
!354
Channels impl
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
auth/store/store.go
+5
-17
5 additions, 17 deletions
auth/store/store.go
with
5 additions
and
17 deletions
auth/store/store.go
+
5
−
17
View file @
6713f7c2
...
@@ -244,9 +244,8 @@ func (s *Store) HandleReceivedRequest(partner *id.ID, handler func(*ReceivedRequ
...
@@ -244,9 +244,8 @@ func (s *Store) HandleReceivedRequest(partner *id.ID, handler func(*ReceivedRequ
s
.
mux
.
RLock
()
s
.
mux
.
RLock
()
rr
,
ok
:=
s
.
receivedByID
[
*
partner
]
rr
,
ok
:=
s
.
receivedByID
[
*
partner
]
s
.
mux
.
RUnlock
()
if
!
ok
{
if
!
ok
{
s
.
mux
.
RUnlock
()
return
errors
.
Errorf
(
"Received request not "
+
return
errors
.
Errorf
(
"Received request not "
+
"found: %s"
,
partner
)
"found: %s"
,
partner
)
}
}
...
@@ -255,29 +254,19 @@ func (s *Store) HandleReceivedRequest(partner *id.ID, handler func(*ReceivedRequ
...
@@ -255,29 +254,19 @@ func (s *Store) HandleReceivedRequest(partner *id.ID, handler func(*ReceivedRequ
rr
.
mux
.
Lock
()
rr
.
mux
.
Lock
()
defer
rr
.
mux
.
Unlock
()
defer
rr
.
mux
.
Unlock
()
// Check that the request still exists; it could have been deleted while the
// lock was taken
s
.
mux
.
RLock
()
_
,
ok
=
s
.
receivedByID
[
*
partner
]
s
.
mux
.
RUnlock
()
s
.
mux
.
RUnlock
()
if
!
ok
{
return
errors
.
Errorf
(
"Received request not "
+
"found: %s"
,
partner
)
}
//run the handler
//run the handler
handleErr
:=
handler
(
rr
)
handleErr
:=
handler
(
rr
)
if
handleErr
!=
nil
{
if
handleErr
!=
nil
{
return
errors
.
WithMessage
(
handleErr
,
"Received error from handler"
)
return
errors
.
WithMessage
(
handleErr
,
"Received error from handler"
)
}
}
delete
(
s
.
receivedByID
,
*
partner
)
delete
(
s
.
receivedByID
,
*
partner
)
s
.
save
()
err
:=
s
.
save
()
rr
.
delete
()
rr
.
delete
()
return
nil
return
err
}
}
// HandleSentRequest handles the request singly, only a single operator
// HandleSentRequest handles the request singly, only a single operator
...
@@ -311,16 +300,15 @@ func (s *Store) HandleSentRequest(partner *id.ID, handler func(request *SentRequ
...
@@ -311,16 +300,15 @@ func (s *Store) HandleSentRequest(partner *id.ID, handler func(request *SentRequ
//run the handler
//run the handler
handleErr
:=
handler
(
sr
)
handleErr
:=
handler
(
sr
)
if
handleErr
!=
nil
{
if
handleErr
!=
nil
{
return
errors
.
WithMessage
(
handleErr
,
"Received error from handler"
)
return
errors
.
WithMessage
(
handleErr
,
"Received error from handler"
)
}
}
delete
(
s
.
sentByID
,
*
partner
)
delete
(
s
.
sentByID
,
*
partner
)
s
.
save
()
err
:=
s
.
save
()
sr
.
delete
()
sr
.
delete
()
return
nil
return
err
}
}
// GetReceivedRequest returns the contact representing the partner request
// GetReceivedRequest returns the contact representing the partner request
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment