Skip to content

Commit d8c085d

Browse files
committed
use strncpy to copy ssid
1 parent 31405bc commit d8c085d

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

examples/contact-sensor-app/bouffalolab/bl702l/app_pds.cpp

+1-13
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,10 @@ extern "C" void vApplicationSleep(TickType_t xExpectedIdleTime)
5959
extern BaseType_t TrapNetCounter, *pTrapNetCounter;
6060
if (app_pds_wakeup_source == PDS_WAKEUP_BY_RTC)
6161
{
62-
extern void * pxCurrentTCB;
63-
64-
// ChipLogProgress(NotSpecified, "wakeup source: rtc. %lu vs %lu ms @ %lu\r\n", xExpectedIdleTime,
65-
// (uint32_t) (bl_rtc_get_timestamp_ms() - sleep_before), (uint32_t) bl_rtc_get_timestamp_ms());
66-
67-
// ChipLogProgress(NotSpecified, "application_sleep; %lu, %lu, %lu\r\n", (uint32_t) sleep_calling_time, (uint32_t)
68-
// sleep_time,
69-
// (uint32_t) wakeup_time);
62+
7063
}
7164
else if (app_pds_wakeup_source == PDS_WAKEUP_BY_GPIO)
7265
{
73-
7466
if (((1 << CHIP_RESET_PIN) & app_pds_wakeup_pin) && app_pds_irq_handler)
7567
{
7668
app_pds_irq_handler(&gpio_key);
@@ -80,10 +72,6 @@ extern "C" void vApplicationSleep(TickType_t xExpectedIdleTime)
8072
{
8173
app_pds_irq_handler(&gpio_contact);
8274
}
83-
84-
// ChipLogProgress(NotSpecified, "wakeup source: gpio -> 0x%08lX. %lu vs %lu ms @ %lu\r\n", app_pds_wakeup_pin,
85-
// xExpectedIdleTime, (uint32_t) (bl_rtc_get_timestamp_ms() - sleep_before),
86-
// (uint32_t) bl_rtc_get_timestamp_ms());
8775
}
8876

8977
app_pds_wakeup_source = -1;

src/platform/bouffalolab/BL702/NetworkCommissioningDriver.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -266,13 +266,11 @@ void BLWiFiDriver::OnScanWiFiNetworkDone(void * opaque)
266266
}
267267

268268
p->security.SetRaw(pmsg->records[i].auth_mode);
269-
p->ssidLen = strlen((char *) pmsg->records[i].ssid) < chip::DeviceLayer::Internal::kMaxWiFiSSIDLength
270-
? strlen((char *) pmsg->records[i].ssid)
271-
: chip::DeviceLayer::Internal::kMaxWiFiSSIDLength;
269+
strncpy((char *)p->ssid, (const char *)pmsg->records[i].ssid, kMaxWiFiSSIDLength);
270+
p->ssidLen = strlen((char *) pmsg->records[i].ssid);
272271
p->channel = pmsg->records[i].channel;
273272
p->wiFiBand = chip::DeviceLayer::NetworkCommissioning::WiFiBand::k2g4;
274273
p->rssi = pmsg->records[i].rssi;
275-
memcpy(p->ssid, pmsg->records[i].ssid, p->ssidLen);
276274
memcpy(p->bssid, pmsg->records[i].bssid, 6);
277275

278276
p++;

0 commit comments

Comments
 (0)