pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-01 02:09:57 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix off-by-one error with log writes (#5959)
Some checks are pending
CI / setup (check) (push) Waiting to run
Details
CI / setup (esp32) (push) Waiting to run
Details
CI / setup (esp32c3) (push) Waiting to run
Details
CI / setup (esp32c6) (push) Waiting to run
Details
CI / setup (esp32s3) (push) Waiting to run
Details
CI / setup (nrf52840) (push) Waiting to run
Details
CI / setup (rp2040) (push) Waiting to run
Details
CI / setup (stm32) (push) Waiting to run
Details
CI / check (push) Blocked by required conditions
Details
CI / build-esp32 (push) Blocked by required conditions
Details
CI / build-esp32-s3 (push) Blocked by required conditions
Details
CI / build-esp32-c3 (push) Blocked by required conditions
Details
CI / build-esp32-c6 (push) Blocked by required conditions
Details
CI / build-nrf52 (push) Blocked by required conditions
Details
CI / build-rpi2040 (push) Blocked by required conditions
Details
CI / build-stm32 (push) Blocked by required conditions
Details
CI / package-raspbian (push) Waiting to run
Details
CI / package-raspbian-armv7l (push) Waiting to run
Details
CI / package-native (push) Waiting to run
Details
CI / build-debian-src (push) Waiting to run
Details
CI / test-native (push) Waiting to run
Details
CI / docker-debian-amd64 (push) Waiting to run
Details
CI / docker-alpine-amd64 (push) Waiting to run
Details
CI / docker-debian-arm64 (push) Waiting to run
Details
CI / docker-debian-armv7 (push) Waiting to run
Details
CI / after-checks (push) Blocked by required conditions
Details
CI / gather-artifacts (esp32) (push) Blocked by required conditions
Details
CI / gather-artifacts (esp32c3) (push) Blocked by required conditions
Details
CI / gather-artifacts (esp32c6) (push) Blocked by required conditions
Details
CI / gather-artifacts (esp32s3) (push) Blocked by required conditions
Details
CI / gather-artifacts (nrf52840) (push) Blocked by required conditions
Details
CI / gather-artifacts (rp2040) (push) Blocked by required conditions
Details
CI / gather-artifacts (stm32) (push) Blocked by required conditions
Details
CI / release-artifacts (push) Blocked by required conditions
Details
CI / release-firmware (esp32) (push) Blocked by required conditions
Details
CI / release-firmware (esp32c3) (push) Blocked by required conditions
Details
CI / release-firmware (esp32c6) (push) Blocked by required conditions
Details
CI / release-firmware (esp32s3) (push) Blocked by required conditions
Details
CI / release-firmware (nrf52840) (push) Blocked by required conditions
Details
CI / release-firmware (rp2040) (push) Blocked by required conditions
Details
CI / release-firmware (stm32) (push) Blocked by required conditions
Details
Flawfinder Scan / Flawfinder (push) Waiting to run
Details

Browse Source 
As reported by @jstockdale, when writing coloured logs we were
writing the full string, including a null terminator. This caused
issues for programs consuming our logs. The fix as identified is
not to write the null.

Fixes https://github.com/meshtastic/firmware/issues/5945
This commit is contained in:
Tom Fifield 2025-01-29 09:57:52 +08:00 committed by GitHub
parent 30a31a3a13
commit 6a12760c3d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/RedirectablePrint.cpp
View File

@ -79,17 +79,17 @@ size_t RedirectablePrint::vprintf(const char *logLevel, const char *format, va_l
} }
if (color && logLevel != nullptr) { if (color && logLevel != nullptr) {
if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_DEBUG) == 0) if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_DEBUG) == 0)
Print::write("\u001b[34m", 6); Print::write("\u001b[34m", 5);
if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_INFO) == 0) if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_INFO) == 0)
Print::write("\u001b[32m", 6); Print::write("\u001b[32m", 5);
if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_WARN) == 0) if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_WARN) == 0)
Print::write("\u001b[33m", 6); Print::write("\u001b[33m", 5);
if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_ERROR) == 0) if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_ERROR) == 0)
Print::write("\u001b[31m", 6); Print::write("\u001b[31m", 5);
} }
len = Print::write(printBuf, len); len = Print::write(printBuf, len);
if (color && logLevel != nullptr) { if (color && logLevel != nullptr) {
Print::write("\u001b[0m", 5); Print::write("\u001b[0m", 4);
} }
return len; return len;
} }
@ -107,15 +107,15 @@ void RedirectablePrint::log_to_serial(const char *logLevel, const char *format,
// include the header // include the header
if (color) { if (color) {
if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_DEBUG) == 0) if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_DEBUG) == 0)
Print::write("\u001b[34m", 6); Print::write("\u001b[34m", 5);
if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_INFO) == 0) if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_INFO) == 0)
Print::write("\u001b[32m", 6); Print::write("\u001b[32m", 5);
if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_WARN) == 0) if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_WARN) == 0)
Print::write("\u001b[33m", 6); Print::write("\u001b[33m", 5);
if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_ERROR) == 0) if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_ERROR) == 0)
Print::write("\u001b[31m", 6); Print::write("\u001b[31m", 5);
if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_TRACE) == 0) if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_TRACE) == 0)
Print::write("\u001b[35m", 6); Print::write("\u001b[35m", 5);
} }
uint32_t rtc_sec = getValidTime(RTCQuality::RTCQualityDevice, true); // display local time on logfile uint32_t rtc_sec = getValidTime(RTCQuality::RTCQualityDevice, true); // display local time on logfile
@ -393,4 +393,4 @@ std::string RedirectablePrint::mt_sprintf(const std::string fmt_str, ...)
break; break;
} }
return std::string(formatted.get()); return std::string(formatted.get());
} }