Commit 9e523b5

authored

Merge pull request #370 from fabik111/fix-m0-handle-assignment

Arduino M0 board crashes when setting BLE handle from data buffer

2 parents baa1370 + eef16ce commit 9e523b5Copy full SHA for 9e523b5

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -993,8 +993,8 @@ void ATTClass::readOrReadBlobReq(uint16_t connectionHandle, uint16_t mtu, uint8_`
`993`	`993`	`}`
`994`	`994`	`/// if auth error, hold the response in a buffer.`
`995`	`995`	`bool holdResponse = false;`
`996`		`-`
`997`		`- uint16_thandle = (uint16_t)data;`
	`996`	`+uint16_t handle;`
	`997`	`+ memcpy(&handle, data, sizeof(handle));`
`998`	`998`	`uint16_t offset = (opcode == ATT_OP_READ_REQ) ? 0 : (uint16_t)&data[sizeof(handle)];`
`999`	`999`
`1000`	`1000`	`if ((uint16_t)(handle - 1) > GATT.attributeCount()) {`
`@@ -1248,7 +1248,8 @@ void ATTClass::writeReqOrCmd(uint16_t connectionHandle, uint16_t mtu, uint8_t op`
`1248`	`1248`	`return;`
`1249`	`1249`	`}`
`1250`	`1250`
`1251`		`- uint16_t handle = (uint16_t)data;`
	`1251`	`+ uint16_t handle;`
	`1252`	`+ memcpy(&handle, data, sizeof(handle));`
`1252`	`1253`
`1253`	`1254`	`if ((uint16_t)(handle - 1) > GATT.attributeCount()) {`
`1254`	`1255`	`if (withResponse) {`

Comments

(0)