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

Commit 37b9fc6e authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

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

* commit '4ba5a8ac':
  Fixed adb crash due to accessing freed memory
parents 953907fa 4ba5a8ac

adb/sockets.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -225,11 +225,13 @@ static void local_socket_close_locked(asocket *s) 
          s->id, s->peer->id, s->peer->fd);

          s->id, s->peer->id, s->peer->fd);

        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

        ** pending packets, destroy immediately

        ** pending packets, destroy immediately
@@ -799,6 +801,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);

}

}