andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

safer log field name copy (#5681) 

Co-authored-by: Matthew Kennedy <matthewkennedy@outlook.com>
This commit is contained in:
rusefillc 2023-11-02 12:06:45 -04:00 committed by GitHub
parent dac73c6b8a
commit 816dd47058
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/console/binary_log/log_field.cpp
View File

@ -43,13 +43,13 @@ void LogField::writeHeader(Writer& outBuffer) const {
buffer[54] = m_digits;
// Offset 55, (optional) category string
memset(&buffer[55], 0, 34);
if (m_category) {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-truncation"
// strncpy's exclusion of null terminator is correct and appropriate behavior for this field
strncpy(&buffer[55], m_category, 34);
#pragma GCC diagnostic pop
size_t categoryLength = strlen(m_category);
size_t lengthAfterCategory = 34 - categoryLength;
memcpy(&buffer[55], m_category, categoryLength);
memset(&buffer[55] + categoryLength, 0, lengthAfterCategory);
} else {
memset(&buffer[55], 0, 34);
}
// Total size = 89