Merge "bta_gattc: Fix initialization and free p_q_cmd" into tm-qpr-dev (2252d4a5) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/gatt/bta_gattc_utils.cc

+4 −1

Original line number	Diff line number	Diff line
		@@ -146,6 +146,7 @@ tBTA_GATTC_CLCB* bta_gattc_clcb_alloc(tGATT_IF client_if,
		p_clcb->status = GATT_SUCCESS;
		p_clcb->transport = transport;
		p_clcb->bda = remote_bda;
		p_clcb->p_q_cmd = NULL;

		p_clcb->p_rcb = bta_gattc_cl_get_regcb(client_if);

		@@ -217,7 +218,9 @@ void bta_gattc_clcb_dealloc(tBTA_GATTC_CLCB* p_clcb) {
		p_srcb->gatt_database.Clear();
		}

		if (p_clcb->p_q_cmd != NULL) {
		osi_free_and_reset((void**)&p_clcb->p_q_cmd);
		}
		memset(p_clcb, 0, sizeof(tBTA_GATTC_CLCB));
		}