Minor refactor to support strings with embedded zeros.

Test: manual Change-Id: Iaece3003deb257cbcae65a23a4c4a1ccfd690d49
2018-12-20 10:09:43 -08:00 · 2018-12-20 10:09:43 -08:00 · a9e79489dc
parent d1ff11b94a
commit a9e79489dc
1 changed files with 2 additions and 1 deletions
--- a/adb/adb_io.cpp
+++ b/adb/adb_io.cpp
@ -38,7 +38,8 @@ bool SendProtocolString(int fd, const std::string& s) {

    // The cost of sending two strings outweighs the cost of formatting.
    // "adb sync" performance is affected by this.
-    return WriteFdFmt(fd, "%04x%.*s", length, length, s.c_str());
+    auto str = android::base::StringPrintf("%04x", length).append(s);
+    return WriteFdExactly(fd, str);
 }

 bool ReadProtocolString(int fd, std::string* s, std::string* error) {