commit f48130278fddf30925cb36023e2a2c8e7c15569a
author Elliott Hughes <enh@google.com> Tue Sep 01 21:02:23 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 01 21:02:23 2015 +0000
tree 92097ca2b63b573ac9449a363d163d33364d3d8b
parent 0645b1e2316c4ab3e2ef95ad7c874f1c2c777128
parent cc52cf96185570ad9e2ded5c4d6ea3e32042d650

Merge "Backport missing null check in "adb get-state"." into mnc-ub-dev

adb/adb.cpp

diff --git a/adb/adb.cpp b/adb/adb.cpp
index f64b19f..c09aee3 100644
--- a/adb/adb.cpp
+++ b/adb/adb.cpp
@@ -919,7 +919,7 @@
     if(!strncmp(service,"get-state",strlen("get-state"))) {
         transport = acquire_one_transport(CS_ANY, ttype, serial, NULL);
         SendOkay(reply_fd);
-        SendProtocolString(reply_fd, transport->connection_state_name());
+        SendProtocolString(reply_fd, transport ? transport->connection_state_name() : "unknown");
         return 0;
     }
 #endif // ADB_HOST