am c54efddb: Make sure conn_id is valid before using it (99a00a45) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/srvc/srvc_eng.c

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -411,10 +411,15 @@ void srvc_eng_release_channel (UINT16 conn_id)
	{		{
	tSRVC_CLCB *p_clcb = srvc_eng_find_clcb_by_conn_id(conn_id);		tSRVC_CLCB *p_clcb = srvc_eng_find_clcb_by_conn_id(conn_id);

			if (p_clcb == NULL)
			{
			GATT_TRACE_ERROR("%s: invalid connection id %d", __FUNCTION__, conn_id);
			return;
			}

	p_clcb->cur_srvc_id = SRVC_ID_NONE;		p_clcb->cur_srvc_id = SRVC_ID_NONE;

	/* check pending request */		/* check pending request */
	//if (p_clcb->pend_req == NULL)
	GATT_Disconnect(p_clcb->conn_id);		GATT_Disconnect(p_clcb->conn_id);
	}		}
	/*******************************************************************************		/*******************************************************************************