diff options
| author | Shaju Mathew <shaju@google.com> | 2023-06-01 18:03:03 -0700 |
|---|---|---|
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2023-06-05 19:10:30 +0000 |
| commit | a435e785176a208df81aa35646fe5b6f83b09147 (patch) | |
| tree | 26c4570f6cc8f5ee36233bd88a2b1236e65a8f20 | |
| parent | e6e73778ab4dc94bbb0172b2e5808dc6936d109c (diff) | |
| download | adb-a435e785176a208df81aa35646fe5b6f83b09147.tar.gz | |
Getting rid of spurious memset() in JdwpTracker socket setup.android14-dev
Bug: 245983885
Test: Treehugger
(cherry picked from https://android-review.googlesource.com/q/commit:237944fa6bdf5b834bca0b7a75dbba879c0363df)
Merged-In: Ia293c1320449cd341b10d06e73b96bb97593bb86
Change-Id: Ia293c1320449cd341b10d06e73b96bb97593bb86
| -rw-r--r-- | daemon/jdwp_service.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/daemon/jdwp_service.cpp b/daemon/jdwp_service.cpp index d03573fb..2501688c 100644 --- a/daemon/jdwp_service.cpp +++ b/daemon/jdwp_service.cpp @@ -459,12 +459,16 @@ static int jdwp_tracker_enqueue(asocket* s, apacket::payload_type) { } static asocket* create_process_tracker_service_socket(TrackerKind kind) { - auto t = std::make_unique<JdwpTracker>(kind, true); + std::unique_ptr<JdwpTracker> t = std::make_unique<JdwpTracker>(kind, true); if (!t) { LOG(FATAL) << "failed to allocate JdwpTracker"; } - memset(t.get(), 0, sizeof(asocket)); + /* Object layout (with an inheritance hierarchy) varies across arch (e.g + * armv7a/Android TV vs aarch64), so no assumptions can be made about + * accessing fields based on offsets (e.g memset(t.get(), 0, sizeof(asocket)) + * might clobber an unintended memory location). + */ install_local_socket(t.get()); D("LS(%d): created new jdwp tracker service", t->id); |