commit eafcbe109f97e5a687cc944e65c383fa45d71c8f
author Nick Kralevich <nnk@google.com> Tue Jun 07 16:21:09 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 07 16:21:09 2011 -0700
tree 10e3a544ce7136062c25ede7ab6f4afde560d2ca
parent 771f5146893aa9bbc451aed78e61b3b18c1bc3b4
parent 072a0fac3cabd50c2089d987b5abceac35c74570

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

* commit '072a0fac3cabd50c2089d987b5abceac35c74570':
  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);
 }