Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 638f38d2 authored Jul 26, 2024 by Bhakthavatsala Raghavendra Committed by Automerger Merge Worker Jul 26, 2024

Merge "Add null checks for list access" into main am: 990bebbd am: cc5b850d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3191854

Change-Id: I4bc2a6e01120f39cad454bb7f82680d4ab5e81e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents fceb1029 cc5b850d

system/stack/l2cap/l2c_ble.cc

+8 −3

Original line number	Diff line number	Diff line
		@@ -1026,11 +1026,16 @@ void l2c_ble_link_adjust_allocation(void) {
		/* There is a special case where we have readjusted the link quotas and */
		/* this link may have sent anything but some other link sent packets so */
		/* so we may need a timer to kick off this link's transmissions. */
		if ((p_lcb->link_state == LST_CONNECTED) && (!list_is_empty(p_lcb->link_xmit_data_q)) &&
		if (p_lcb->link_xmit_data_q != nullptr) {
		if ((p_lcb->link_state == LST_CONNECTED) &&
		!list_is_empty(p_lcb->link_xmit_data_q) &&
		(p_lcb->sent_not_acked < p_lcb->link_xmit_quota)) {
		alarm_set_on_mloop(p_lcb->l2c_lcb_timer, L2CAP_LINK_FLOW_CONTROL_TIMEOUT_MS,
		l2c_lcb_timer_timeout, p_lcb);
		}
		} else {
		log::warn("link_xmit_data_q is null");
		}
		}
		}
		}

system/stack/l2cap/l2c_link.cc

+8 −3

Original line number	Diff line number	Diff line
		@@ -665,11 +665,16 @@ void l2c_link_adjust_allocation(void) {
		/* There is a special case where we have readjusted the link quotas and */
		/* this link may have sent anything but some other link sent packets so */
		/* so we may need a timer to kick off this link's transmissions. */
		if ((p_lcb->link_state == LST_CONNECTED) && (!list_is_empty(p_lcb->link_xmit_data_q)) &&
		if (p_lcb->link_xmit_data_q != nullptr) {
		if ((p_lcb->link_state == LST_CONNECTED) &&
		!list_is_empty(p_lcb->link_xmit_data_q) &&
		(p_lcb->sent_not_acked < p_lcb->link_xmit_quota)) {
		alarm_set_on_mloop(p_lcb->l2c_lcb_timer, L2CAP_LINK_FLOW_CONTROL_TIMEOUT_MS,
		l2c_lcb_timer_timeout, p_lcb);
		}
		} else {
		log::warn("link_xmit_data_q is null");
		}
		}
		}
		}