diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-09 14:21:16 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-09 14:21:16 +0000 |
commit | b8016a7210eba240788f262e1e4214576aa6fdd8 (patch) | |
tree | 26c4570f6cc8f5ee36233bd88a2b1236e65a8f20 | |
parent | bc33378d825ad6be5750bcbbea62441ace6381fa (diff) | |
parent | 218aa200958c42c5c11e33e9b708fbf7c6431166 (diff) | |
download | adb-android14-d2-s1-release.tar.gz |
Snap for 10289553 from 218aa200958c42c5c11e33e9b708fbf7c6431166 to udc-d2-releaseandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Change-Id: If79b2e5e517797550407a49e4e319dd6e11944fa
-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); |