summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@hadrons.org>2013-06-01 18:01:57 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2013-06-14 17:46:51 +0200
commit73a857512736f4638a82f5cec5cb8ad641c9f8ec (patch)
treeb0f164f4f701bd7e3a940b7c0b081bd45beca31b
parent26a97221b86ef958715a1c354331432aa71fd64a (diff)
downloadneard-73a857512736f4638a82f5cec5cb8ad641c9f8ec.tar.gz
neard-73a857512736f4638a82f5cec5cb8ad641c9f8ec.tar.bz2
neard-73a857512736f4638a82f5cec5cb8ad641c9f8ec.zip
bluetooth: Fix memory leaks on error or when not pairing
Warned-by: cppcheck
-rw-r--r--src/bluetooth.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bluetooth.c b/src/bluetooth.c
index 28df08c..b446fd7 100644
--- a/src/bluetooth.c
+++ b/src/bluetooth.c
@@ -756,11 +756,14 @@ int __near_bluetooth_parse_oob_record(struct carrier_data *data,
}
ptr = ptr + oob->bt_name_len;
} else {
+ bt_eir_free(oob);
return -EINVAL;
}
- if (pair == FALSE)
+ if (pair == FALSE) {
+ bt_eir_free(oob);
return 0;
+ }
/* check and get the default adapter */
oob->def_adapter = g_strdup(bt_def_oob_data.def_adapter);