Merge "DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event" into oc-dev (66b70376) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/smp/smp_br_main.cc

+7 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#include "bt_target.h"

		#include <string.h>
		#include "log/log.h"
		#include "smp_int.h"

		const char* const smp_br_state_name[SMP_BR_STATE_MAX + 1] = {
		@@ -308,6 +309,12 @@ void smp_br_state_machine_event(tSMP_CB* p_cb, tSMP_BR_EVENT event,
		return;
		}

		if (p_cb->role > HCI_ROLE_SLAVE) {
		SMP_TRACE_ERROR("%s: invalid role %d", __func__, p_cb->role);
		android_errorWriteLog(0x534e4554, "80145946");
		return;
		}

		SMP_TRACE_DEBUG("SMP Role: %s State: [%s (%d)], Event: [%s (%d)]",
		(p_cb->role == HCI_ROLE_SLAVE) ? "Slave" : "Master",
		smp_get_br_state_name(p_cb->br_state), p_cb->br_state,