commit bee0f25aa0560a7147fdd31db33f6deb995dbc5d
author George Burgess IV <gbiv@google.com> Mon Feb 19 10:56:53 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 19 10:56:53 2018 +0000
tree a2ca13e9b8e39db47a5199106b5bf0ef2b7f0cad
parent f1ad2c78817896085aaf0cbc28ed676d2d724689
parent 304f65c7d98ec90aef7545642ea1c936d13d821d

Merge "Fix a memory leak" am: cb1b68f9b3
am: 894337ee0b

Change-Id: Ieb9b695cc681831fc3684bcb5d19ddc41099949f

adb/services.cpp

diff --git a/adb/services.cpp b/adb/services.cpp
index 6dc71cf..fe74eb6 100644
--- a/adb/services.cpp
+++ b/adb/services.cpp
@@ -296,6 +296,7 @@
         void* arg = strdup(name + 7);
         if (arg == NULL) return -1;
         ret = create_service_thread("reboot", reboot_service, arg);
+        if (ret < 0) free(arg);
     } else if(!strncmp(name, "root:", 5)) {
         ret = create_service_thread("root", restart_root_service, nullptr);
     } else if(!strncmp(name, "unroot:", 7)) {