From 828e769b3b90c171540965f50698055bdfc91f68 Mon Sep 17 00:00:00 2001 From: proddy Date: Mon, 7 Mar 2022 12:30:50 +0100 Subject: [PATCH] add bufsize to messagetime() --- src/web/WebLogService.cpp | 8 ++++---- src/web/WebLogService.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/web/WebLogService.cpp b/src/web/WebLogService.cpp index 56c89070a..949a647c9 100644 --- a/src/web/WebLogService.cpp +++ b/src/web/WebLogService.cpp @@ -156,9 +156,9 @@ void WebLogService::loop() { } // convert time to real offset -char * WebLogService::messagetime(char * out, const uint64_t t) { +char * WebLogService::messagetime(char * out, const uint64_t t, size_t bufsize) { if (!time_offset_) { - strlcpy(out, uuid::log::format_timestamp_ms(t, 3).c_str(), sizeof(out)); + strlcpy(out, uuid::log::format_timestamp_ms(t, 3).c_str(), bufsize); } else { time_t t1 = time_offset_ + t / 1000ULL; strftime(out, 25, "%F %T", localtime(&t1)); @@ -173,7 +173,7 @@ void WebLogService::transmit(const QueuedLogMessage & message) { JsonObject logEvent = jsonDocument.to(); char time_string[25]; - logEvent["t"] = messagetime(time_string, message.content_->uptime_ms); + logEvent["t"] = messagetime(time_string, message.content_->uptime_ms, sizeof(time_string)); logEvent["l"] = message.content_->level; logEvent["i"] = message.id_; logEvent["n"] = message.content_->name; @@ -200,7 +200,7 @@ void WebLogService::fetchLog(AsyncWebServerRequest * request) { JsonObject logEvent = log.createNestedObject(); char time_string[25]; - logEvent["t"] = messagetime(time_string, message.content_->uptime_ms); + logEvent["t"] = messagetime(time_string, message.content_->uptime_ms, sizeof(time_string)); logEvent["l"] = message.content_->level; logEvent["i"] = message.id_; logEvent["n"] = message.content_->name; diff --git a/src/web/WebLogService.h b/src/web/WebLogService.h index 71ec42654..4ae7b6434 100644 --- a/src/web/WebLogService.h +++ b/src/web/WebLogService.h @@ -62,7 +62,7 @@ class WebLogService : public uuid::log::Handler { void fetchLog(AsyncWebServerRequest * request); void getValues(AsyncWebServerRequest * request); - char * messagetime(char * out, const uint64_t t); + char * messagetime(char * out, const uint64_t t, size_t bufsize); void setValues(AsyncWebServerRequest * request, JsonVariant & json); AsyncCallbackJsonWebHandler setValues_; // for POSTs