Merge "bta_jv_act: Avoid potential NULL dereference" (41e640e4) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/jv/bta_jv_act.cc

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2117,11 +2117,12 @@ static void fcchan_data_cbk(uint16_t chan, const RawAddress& bd_addr,
	if (tc) {		if (tc) {
	// try to find an open socked for that addr and channel		// try to find an open socked for that addr and channel
	t = fcclient_find_by_addr(tc->clients, &bd_addr);		t = fcclient_find_by_addr(tc->clients, &bd_addr);
			}
	if (!t) {		if (!t) {
	// no socket -> drop it		// no socket -> drop it
	return;		return;
	}		}
	}

	sock_cback = t->p_cback;		sock_cback = t->p_cback;
	sock_id = t->l2cap_socket_id;		sock_id = t->l2cap_socket_id;