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

Commit 6def9bd6 authored by Josh Gao's avatar Josh Gao
Browse files

adb: properly erase destroyed jdwp_trackers. 

std::remove_if moves to-be-removed elements to the end of the vector
and returns an iterator that must be .erased.

Bug: http://b/35772578
Test: mma
Change-Id: Idfe8520e176204ac5ce000c30704873a3ffe6c9c
parent dda9cbb3

adb/jdwp_service.cpp

+2 −1
Original line number Diff line number Diff line
@@ -571,7 +571,8 @@ static void jdwp_tracker_close(asocket* s) { 
    remove_socket(s);



    auto pred = [s](const auto& tracker) { return tracker.get() == s; };

    std::remove_if(_jdwp_trackers.begin(), _jdwp_trackers.end(), pred);

    _jdwp_trackers.erase(std::remove_if(_jdwp_trackers.begin(), _jdwp_trackers.end(), pred),

                         _jdwp_trackers.end());

}



static void jdwp_tracker_ready(asocket* s) {