pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-13 00:22:10 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

use fixed-size buffer in RedirectablePrint::vprintf() (#1622)

Browse Source 
Co-authored-by: Peter Lawrence <12226419+majbthrd@users.noreply.github.com>
Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
This commit is contained in:
majbthrd 2022-08-12 13:41:16 -05:00 committed by GitHub
parent 64f852e3f7
commit f66c8572b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/RedirectablePrint.cpp
View File

@ -38,20 +38,13 @@ size_t RedirectablePrint::write(uint8_t c)
size_t RedirectablePrint::vprintf(const char *format, va_list arg) size_t RedirectablePrint::vprintf(const char *format, va_list arg)
{ {
va_list copy; va_list copy;
static char printBuf[160];
va_copy(copy, arg); va_copy(copy, arg);
int len = vsnprintf(printBuf, printBufLen, format, copy); int len = vsnprintf(printBuf, sizeof(printBuf), format, copy);
va_end(copy); va_end(copy);
if (len < 0) {
va_end(arg); if (len < 0) return 0;
return 0;
};
if (len >= (int)printBufLen) {
delete[] printBuf;
printBufLen *= 2;
printBuf = new char[printBufLen];
len = vsnprintf(printBuf, printBufLen, format, arg);
}
len = Print::write(printBuf, len); len = Print::write(printBuf, len);
return len; return len;

4
src/RedirectablePrint.h
View File

@ -12,10 +12,6 @@ class RedirectablePrint : public Print
{ {
Print *dest; Print *dest;
/// We dynamically grow this scratch buffer if necessary
char *printBuf = new char[64];
size_t printBufLen = 64;
/// Used to allow multiple logDebug messages to appear on a single log line /// Used to allow multiple logDebug messages to appear on a single log line
bool isContinuationMessage = false; bool isContinuationMessage = false;