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

Commit 804180b2 authored by Yabin Cui's avatar Yabin Cui Committed by Gerrit Code Review
Browse files

Merge "adb: fix a data race in local_socket_event_func."

parents fbdd5ee2 00674124
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -360,9 +360,12 @@ static void local_socket_event_func(int fd, unsigned ev, void* _s)
        } else {
            p->len = max_payload - avail;

            // s->peer->enqueue() may call s->close() and free s,
            // so save variables for debug printing below.
            unsigned saved_id = s->id;
            int saved_fd = s->fd;
            r = s->peer->enqueue(s->peer, p);
            D("LS(%d): fd=%d post peer->enqueue(). r=%d\n", s->id, s->fd,
              r);
            D("LS(%u): fd=%d post peer->enqueue(). r=%d\n", saved_id, saved_fd, r);

            if (r < 0) {
                    /* error return means they closed us as a side-effect