X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-oal%2Foal-hfp.c;h=2e786dc792b51f5f8f4bec638584bd28c38e3cab;hb=86f53692565aba2dcc0ad5c7c3bba65cffe0d0ec;hp=7e1dee8292ee905f85305a00c8e6fc7a8a4f5149;hpb=7c073fc0f4e8dd15c7d66ce0f7e00b602c2be544;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/bt-oal/oal-hfp.c b/bt-oal/oal-hfp.c
index 7e1dee8..2e786dc 100644
--- a/bt-oal/oal-hfp.c
+++ b/bt-oal/oal-hfp.c
@@ -212,16 +212,19 @@ static void cb_hfp_connection_state(bthf_connection_state_t state, bt_bdaddr_t *
 	int event_type;
 	bdstr_t bdstr;
 	bt_address_t * event_data = NULL;
-	event_data = g_new0(bt_address_t, 1);
-	memcpy(event_data->addr, bd_addr->address, BT_ADDRESS_BYTES_NUM);
 
 	if (bd_addr == NULL) {
 		BT_ERR("Address is NULL");
-		if (event_data)
-			g_free(event_data);
 		return;
 	}
 
+	event_data = g_new0(bt_address_t, 1);
+	if (event_data == NULL) {
+		BT_ERR("failed to allocate event_data");
+		return;
+	}
+	memcpy(event_data->addr, bd_addr->address, BT_ADDRESS_BYTES_NUM);
+
 	BT_INFO("HFP Profile state = [%d],  BT Address = [%s]", state, bdt_bd2str((bt_address_t*)bd_addr, &bdstr));
 	switch (state) {
 	case BTHF_CONNECTION_STATE_DISCONNECTED: {
@@ -242,8 +245,7 @@ static void cb_hfp_connection_state(bthf_connection_state_t state, bt_bdaddr_t *
 	}
 	default: {
 		BT_INFO("Invalid state");
-		if (event_data)
-			g_free(event_data);
+		g_free(event_data);
 		return;
 	}
 	}
@@ -255,15 +257,19 @@ static void cb_hfp_audio_connection_state(bthf_audio_state_t state, bt_bdaddr_t
 	int event_type;
 	bdstr_t bdstr;
 	bt_address_t * event_data = NULL;
-	event_data = g_new0(bt_address_t, 1);
-	memcpy(event_data->addr, bd_addr->address, BT_ADDRESS_BYTES_NUM);
 
 	if (bd_addr == NULL) {
 		BT_ERR("Address is NULL");
-		if (event_data)
-			g_free(event_data);
 		return;
 	}
+
+	event_data = g_new0(bt_address_t, 1);
+	if (event_data == NULL) {
+		BT_ERR("failed to allocate event_data");
+		return;
+	}
+	memcpy(event_data->addr, bd_addr->address, BT_ADDRESS_BYTES_NUM);
+
 	BT_INFO("HFP Audio state = [%d],  BT Address = [%s]", state, bdt_bd2str((bt_address_t*)bd_addr, &bdstr));
 
 	switch (state) {
@@ -289,8 +295,7 @@ static void cb_hfp_audio_connection_state(bthf_audio_state_t state, bt_bdaddr_t
 	}
 	default: {
 		BT_INFO("Invalid state");
-		if (event_data)
-			g_free(event_data);
+		g_free(event_data);
 		return;
 	}
 	}