sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-08 08:41:59 +00:00
Code Issues Releases Wiki Activity

bounds fixes

Browse Source
This commit is contained in:
J. Nick Koston
2025-12-20 11:00:03 -10:00
parent c22eff24d8
commit 496c09b333
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
esphome/components/syslog/esphome_syslog.cpp
View File

@@ -42,31 +42,38 @@ void Syslog::log_(const int level, const char *tag, const char *message, size_t
len -= 11;
}
// Build syslog packet on stack - 508 is max UDP packet size
// Build syslog packet on stack (508 bytes chosen as practical limit for syslog over UDP)
char packet[508];
size_t offset = 0;
size_t remaining = sizeof(packet);
// Write PRI
int ret = snprintf(packet, sizeof(packet), "<%d>", pri);
if (ret > 0)
int ret = snprintf(packet, remaining, "<%d>", pri);
if (ret > 0 && static_cast<size_t>(ret) < remaining) {
offset = ret;
remaining -= ret;
}
// Write timestamp directly into packet (RFC 5424: use "-" if time not valid)
auto now = this->time_->now();
if (now.is_valid()) {
offset += now.strftime(packet + offset, sizeof(packet) - offset, "%b %e %H:%M:%S");
} else {
size_t written = now.strftime(packet + offset, remaining, "%b %e %H:%M:%S");
offset += written;
remaining -= written;
} else if (remaining > 0) {
packet[offset++] = '-';
remaining--;
}
// Write hostname, tag, and message
ret = snprintf(packet + offset, sizeof(packet) - offset, " %s %s: %.*s", App.get_name().c_str(), tag, (int) len,
message);
if (ret > 0)
offset += ret;
ret = snprintf(packet + offset, remaining, " %s %s: %.*s", App.get_name().c_str(), tag, (int) len, message);
if (ret > 0) {
// snprintf returns chars that would be written; clamp to actual buffer space
offset += std::min(static_cast<size_t>(ret), remaining > 0 ? remaining - 1 : 0);
}
if (offset > 0) {
this->parent_->send_packet(reinterpret_cast<const uint8_t *>(packet), std::min(offset, sizeof(packet) - 1));
this->parent_->send_packet(reinterpret_cast<const uint8_t *>(packet), offset);
}
}