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

Merge "Fixed adb crash due to accessing freed memory"

Browse source
This commit is contained in:
Nick Kralevich 2011-06-07 15:45:36 -07:00 • committed by Android Code Review
commit 072a0fac3c
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.c
View file

@ -221,10 +221,12 @@ static void local_socket_close_locked(asocket *s)
if(s->peer) { if(s->peer) {
s->peer->peer = 0; s->peer->peer = 0;
// tweak to avoid deadlock // tweak to avoid deadlock
if (s->peer->close == local_socket_close) if (s->peer->close == local_socket_close) {
local_socket_close_locked(s->peer); local_socket_close_locked(s->peer);
else } else {
s->peer->close(s->peer); s->peer->close(s->peer);
}
s->peer = 0;
} }
/* If we are already closing, or if there are no /* If we are already closing, or if there are no
@ -782,6 +784,7 @@ static void smart_socket_close(asocket *s)
if(s->peer) { if(s->peer) {
s->peer->peer = 0; s->peer->peer = 0;
s->peer->close(s->peer); s->peer->close(s->peer);
s->peer = 0;
} }
free(s); free(s);
} }