ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 860169cb: am 804180b2: Merge "adb: fix a data race in local_socket_event_func."

Browse source 
* commit '860169cbf89ca007fd04823110e1157346d146f5':
  adb: fix a data race in local_socket_event_func.
This commit is contained in:
Yabin Cui 2015-08-27 12:40:22 +00:00 • committed by Android Git Automerger
commit 8b46ad457f
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adb/sockets.cpp
View file

@ -360,9 +360,12 @@ static void local_socket_event_func(int fd, unsigned ev, void* _s)
} else { } else {
p->len = max_payload - avail; p->len = max_payload - avail;
// s->peer->enqueue() may call s->close() and free s,
// so save variables for debug printing below.
unsigned saved_id = s->id;
int saved_fd = s->fd;
r = s->peer->enqueue(s->peer, p); r = s->peer->enqueue(s->peer, p);
D("LS(%d): fd=%d post peer->enqueue(). r=%d\n", s->id, s->fd, D("LS(%u): fd=%d post peer->enqueue(). r=%d\n", saved_id, saved_fd, r);
r);
if (r < 0) { if (r < 0) {
/* error return means they closed us as a side-effect /* error return means they closed us as a side-effect