Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-08-17 02:47:52 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

[ble_device_base] Treat a partially bound merger as unbound (#18235)

Browse Source
This commit is contained in:
J. Nick Koston
2026-08-10 13:02:27 -05:00
committed by GitHub
parent 293d0b90d9
commit 4cf7ad9c63
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/ble_device_base/scan_response_merger.cpp
+2 -1
View File
@@ -8,7 +8,8 @@ namespace esphome::ble_device_base {
void ScanResponseMerger::deliver_(const uint8_t *mac, int8_t rssi, uint8_t addr_type, const uint8_t *data,
uint8_t data_len, bool raw_only) {
if (this->dispatcher_ == nullptr)
// A partial bind is treated as unbound; never dereference half a binding.
if (this->dispatcher_ == nullptr || this->scan_continuous_ == nullptr)
return;
this->dispatcher_->dispatch(mac, rssi, addr_type, data, data_len, raw_only,
*this->scan_continuous_ ? nullptr : this->log_tag_);
tests/components/ble_device_base/test_scan_response_merger.cpp
+10
View File
@@ -179,5 +179,15 @@ TEST_F(ScanResponseMergerTest, UnboundMergerDropsInsteadOfCrashing) {
EXPECT_TRUE(unbound.empty());
}
TEST_F(ScanResponseMergerTest, PartialBindIsTreatedAsUnbound) {
ScanResponseMerger partial;
partial.bind(&this->dispatcher_, nullptr, "test");
std::vector<uint8_t> data(20, 0xAA);
partial.submit_scan_rsp(MAC_A, -70, 0, data.data(), data.size());
partial.stash_adv(MAC_A, -40, 0, data.data(), data.size(), 0);
partial.flush(); // dropped, not dispatched through half a binding
EXPECT_TRUE(this->raw_.frames.empty());
}
} // namespace
} // namespace esphome::ble_device_base::testing