meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

prevent a oob via serial or lora - causing a crash and hardware interaction

Browse source
This commit is contained in:
Patrick Winnertz 2026-04-20 22:44:21 +02:00
parent dee3e26ac0
commit e5dd4be807
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/helpers/CommonCLI.cpp
View file

@ -726,7 +726,7 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep
strcpy(reply, "Error: unsupported by this board"); strcpy(reply, "Error: unsupported by this board");
}; };
} else { } else {
sprintf(reply, "unknown config: %s", config); snprintf(reply, CLI_REPLY_MAX, "unknown config: %.128s", config);
} }
} }
@ -784,10 +784,10 @@ void CommonCLI::handleGetCmd(uint32_t sender_timestamp, char* command, char* rep
} else if (memcmp(config, "direct.txdelay", 14) == 0) { } else if (memcmp(config, "direct.txdelay", 14) == 0) {
sprintf(reply, "> %s", StrHelper::ftoa(_prefs->direct_tx_delay_factor)); sprintf(reply, "> %s", StrHelper::ftoa(_prefs->direct_tx_delay_factor));
} else if (memcmp(config, "owner.info", 10) == 0) { } else if (memcmp(config, "owner.info", 10) == 0) {
*reply++ = '>'; char* reply_end = reply + CLI_REPLY_MAX - 1; // leave room for null
*reply++ = ' '; *reply++ = '>'; *reply++ = ' ';
const char* sp = _prefs->owner_info; const char* sp = _prefs->owner_info;
while (*sp) { while (*sp && reply < reply_end) {
*reply++ = (*sp == '\n') ? '|' : *sp; // translate newline back to orig '|' *reply++ = (*sp == '\n') ? '|' : *sp; // translate newline back to orig '|'
sp++; sp++;
} }
@ -887,7 +887,7 @@ void CommonCLI::handleGetCmd(uint32_t sender_timestamp, char* command, char* rep
strcpy(reply, "ERROR: Power management not supported"); strcpy(reply, "ERROR: Power management not supported");
#endif #endif
} else { } else {
sprintf(reply, "??: %s", config); snprintf(reply, CLI_REPLY_MAX, "??: %.128s", config);
} }
} }

4
src/helpers/CommonCLI.h
View file

@ -10,6 +10,10 @@
#define WITH_BRIDGE #define WITH_BRIDGE
#endif #endif
// Smallest reply buffer among all callers (serial main.cpp: char reply[160]).
// Used by snprintf() in CLI handlers to prevent stack buffer overflows.
#define CLI_REPLY_MAX 160
#define ADVERT_LOC_NONE 0 #define ADVERT_LOC_NONE 0
#define ADVERT_LOC_SHARE 1 #define ADVERT_LOC_SHARE 1
#define ADVERT_LOC_PREFS 2 #define ADVERT_LOC_PREFS 2