| commit | 5b65f86a2f98dea63bdcd7ded1175ca17d305b44 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Sep 01 12:54:21 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Sep 01 19:57:07 2015 +0000 |
| tree | 79030581152b31805f05f37ce1a0918a3d243128 | |
| parent | 46603db57a80fa5a3661514967c25db056efe224 [diff] |
Backport missing null check in "adb get-state". Bug: https://code.google.com/p/android/issues/detail?id=184011 Bug: http://b/23709037 Change-Id: Ia33814bd2adc310c2471cd6a12b9a73f27d77182
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