Skip to content

Commit 2082b01

Browse files
Apply suggestions from code review
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
1 parent 4de6656 commit 2082b01

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

usermods/udp_name_sync/udp_name_sync.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,16 @@ class UdpNameSync : public Usermod {
4545
return;
4646
}
4747

48-
if (0 == strcmp(mainseg.name, segmentName)) return; //same name, do nothing
48+
const char* curName = mainseg.name ? mainseg.name : "";
49+
if (strcmp(curName, segmentName) == 0) return; // same name, do nothing
4950

5051
notifierUdp.beginPacket(broadcastIp, udpPort);
5152
DEBUG_PRINT(F("UdpNameSync: saving segment name "));
5253
DEBUG_PRINTLN(mainseg.name);
53-
byte length = strlen(mainseg.name);
54-
strlcpy(segmentName, mainseg.name, length+1);
55-
strlcpy((char *)&udpOut[1], segmentName, length+1);
56-
notifierUdp.write(udpOut, length + 2);
54+
size_t length = strlen(mainseg.name);
55+
strlcpy(segmentName, mainseg.name, sizeof(segmentName));
56+
strlcpy((char *)&udpOut[1], segmentName, sizeof(udpOut) - 1); // leave room for header byte
57+
notifierUdp.write(udpOut, 2 + strnlen((char *)&udpOut[1], sizeof(udpOut) - 1));
5758
notifierUdp.endPacket();
5859
DEBUG_PRINT(F("UdpNameSync: Sent segment name : "));
5960
DEBUG_PRINTLN(segmentName);

wled00/um_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ bool UsermodManager::onEspNowMessage(uint8_t* sender, uint8_t* payload, uint8_t
6868
return false;
6969
}
7070
#endif
71-
bool UsermodManager::onUdpPacket(uint8_t* payload, uint8_t len) {
71+
bool UsermodManager::onUdpPacket(uint8_t* payload, size_t len) {
7272
for (auto mod = _usermod_table_begin; mod < _usermod_table_end; ++mod) if ((*mod)->onUdpPacket(payload, len)) return true;
7373
return false;
7474
}

0 commit comments

Comments
 (0)