Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ec54854 authored by Tom Marlin's avatar Tom Marlin Committed by Android Git Automerger
Browse files

am 774abe7b: Cherry-pick 49f1857d from master. do not merge. 

* commit '774abe7b':
  Cherry-pick 49f1857d from master. do not merge.
parents 69c2dcbb 774abe7b

adb/sockets.c

+5 −2
Original line number Diff line number Diff line
@@ -221,11 +221,13 @@ static void local_socket_close_locked(asocket *s) 
    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

        ** pending packets, destroy immediately
@@ -756,6 +758,7 @@ static void smart_socket_close(asocket *s) 
    if(s->peer) {

        s->peer->peer = 0;

        s->peer->close(s->peer);

        s->peer = 0;

    }

    free(s);

}