Skip to content

fix: NUL-terminate ADB OPEN destinations #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cocool97 merged 2 commits into from
Aug 2, 2026
Merged

fix: NUL-terminate ADB OPEN destinations #211

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f073581
fix: NUL-terminate ADB OPEN destinations
atty303 Jul 30, 2026
ac2fe85
chore: add comment
cocool97 Aug 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion adb_client/src/message_devices/adb_message_device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,19 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
let mut rng = rand::rng();
let local_id: u32 = rng.random();

// adbd used to expect a null-terminated string.
// keep doing so to maintain compatibility with older versions.
// https://cs.android.com/android/platform/superproject/+/android-latest-release:packages/modules/adb/sockets.cpp;l=560?q=sockets.cpp
let mut destination = cmd.to_string().into_bytes();
if !destination.ends_with(&[0]) {
destination.push(0);
}

let message = ADBTransportMessage::try_new(
MessageCommand::Open,
local_id, // Our 'local-id'
0,
cmd.to_string().as_bytes(),
&destination,
)?;
self.transport.write_message(message)?;

Expand Down
Loading