summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-03-19 17:12:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-19 17:12:51 +0000
commitf13a1d57c8a9de266cdbddbfe2c8961d5fb55b57 (patch)
treec9c9c06626f25774c5e6c312338ef395eff10209
parentb7ca152be014c8332306a2bf0f46941ff8f88bb2 (diff)
parent082ac80827e538528fd0b9cba362742f62e1f5ff (diff)
downloadsystem_core-f13a1d57c8a9de266cdbddbfe2c8961d5fb55b57.zip
system_core-f13a1d57c8a9de266cdbddbfe2c8961d5fb55b57.tar.gz
system_core-f13a1d57c8a9de266cdbddbfe2c8961d5fb55b57.tar.bz2
am 082ac808: am b4ebc475: Merge "Fix memory leak on jdwp_process_free()"
* commit '082ac80827e538528fd0b9cba362742f62e1f5ff': Fix memory leak on jdwp_process_free()
-rw-r--r--adb/fdevent.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/adb/fdevent.cpp b/adb/fdevent.cpp
index 45d33db..eeb2a9c 100644
--- a/adb/fdevent.cpp
+++ b/adb/fdevent.cpp
@@ -587,6 +587,7 @@ void fdevent_destroy(fdevent *fde)
FATAL("fde %p not created by fdevent_create()\n", fde);
}
fdevent_remove(fde);
+ free(fde);
}
void fdevent_install(fdevent *fde, int fd, fd_func func, void *arg)