Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_system_core into replicant-6.0

2 files changed, 5 insertions, 3 deletions

diff --git a/adb/adb.cpp b/adb/adb.cpp
index 0ff9e3c..9f9e6bd 100644
--- a/adb/adb.cpp
+++ b/adb/adb.cpp
@@ -919,7 +919,7 @@ int handle_host_request(char *service, transport_type ttype, char* serial, int r
     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
diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index cd635ce..eb0c84b 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -756,8 +756,10 @@ static int logcat(transport_type transport, const char* serial, int argc, const
 
 static int mkdirs(const char *path)
 {
+    std::string holder(path);
+
     int ret;
-    char *x = (char *)path + 1;
+    char *x = &holder[1];
 
     for(;;) {
         x = adb_dirstart(x);
@@ -774,7 +776,7 @@ static int mkdirs(const char *path)
 }
 
 static int backup(int argc, const char** argv) {
-    const char* filename = "./backup.ab";
+    const char* filename = "backup.ab";
 
     /* find, extract, and use any -f argument */
     for (int i = 1; i < argc; i++) {