commit 4ba5a8acba033127befd184f2f78cf0580995b07
author Nick Kralevich <nnk@google.com> Tue Jun 07 16:28:09 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 07 16:28:09 2011 -0700
tree 653f73841aefb3c70019e1717af5a0c6087adf6d
parent 716104b40df12d367cb5f649b92c6105d5978787
parent eafcbe109f97e5a687cc944e65c383fa45d71c8f

am eafcbe10: am 072a0fac: Merge "Fixed adb crash due to accessing freed memory"

* commit 'eafcbe109f97e5a687cc944e65c383fa45d71c8f':
  Fixed adb crash due to accessing freed memory

adb/sockets.c

diff --git a/adb/sockets.c b/adb/sockets.c
index aa4d5fc..f0357d6 100644
--- a/adb/sockets.c
+++ b/adb/sockets.c
@@ -221,10 +221,12 @@
     if(s->peer) {
         s->peer->peer = 0;
         // tweak to avoid deadlock
-        if (s->peer->close == local_socket_close)
+        if (s->peer->close == local_socket_close) {
             local_socket_close_locked(s->peer);
-        else
+        } else {
             s->peer->close(s->peer);
+        }
+        s->peer = 0;
     }
 
         /* If we are already closing, or if there are no
@@ -782,6 +784,7 @@
     if(s->peer) {
         s->peer->peer = 0;
         s->peer->close(s->peer);
+        s->peer = 0;
     }
     free(s);
 }