summaryrefslogtreecommitdiff
path: root/obexd
diff options
context:
space:
mode:
authorSahil Pai <sahil.pai1@samsung.com>2018-05-03 17:35:38 +0530
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2018-05-07 11:26:33 +0300
commit87f4b56b0150a620c2697b244c6353cb43f3fd13 (patch)
treedb55b412f242aec4d0e12c423a62aa63ff3d1450 /obexd
parent4e926f8e3ef2e3321f9b169db54ec256d9b41207 (diff)
downloadbluez-87f4b56b0150a620c2697b244c6353cb43f3fd13.tar.gz
obexd: Fix memory leak when loading plugins
On failure to open plugin directory, memory allocated to 'patterns' and 'excludes' is not being freed, and the following memory leak is logged: Direct leak of 28 byte(s) in 1 object(s) allocated from: #0 0xb6aa1c49 in malloc (/usr/lib/liblsan.so+0x9c49) #1 0xb6976e89 in g_malloc (/lib/libglib-2.0.so.0+0x3ae89) #2 0xb69886f1 in g_strsplit_set (/lib/libglib-2.0.so.0+0x4c6f1) #3 0xb6f82f3b in plugin_init (/usr/libexec/bluetooth/obexd+0x20f3b) #4 0xb6f70dc9 in main (/usr/libexec/bluetooth/obexd+0xedc9)
Diffstat (limited to 'obexd')
-rw-r--r--obexd/src/plugin.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/obexd/src/plugin.c b/obexd/src/plugin.c
index 7d971b6c8..a1962b91d 100644
--- a/obexd/src/plugin.c
+++ b/obexd/src/plugin.c
@@ -138,8 +138,11 @@ gboolean plugin_init(const char *pattern, const char *exclude)
DBG("Loading plugins %s", PLUGINDIR);
dir = g_dir_open(PLUGINDIR, 0, NULL);
- if (!dir)
+ if (!dir) {
+ g_strfreev(patterns);
+ g_strfreev(excludes);
return FALSE;
+ }
while ((file = g_dir_read_name(dir)) != NULL) {
struct obex_plugin_desc *desc;