BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-04 00:36:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

ProcessCompositeInput: ensure we dont cause UB on memcmp

Browse Source
This commit is contained in:
Lion Kortlepel 2020-11-08 14:31:15 +01:00
parent e42256dd5f
commit b9758ddaea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Console.cpp
View File

@ -129,7 +129,7 @@ static std::string CompositeInput;
static bool CompositeInputExpected { false }; static bool CompositeInputExpected { false };
static void ProcessCompositeInput() { static void ProcessCompositeInput() {
if (memcmp(CompositeInput.data(), std::array<char, 2> { 91, 65 }.data(), 2) == 0) { if (CompositeInput.size() == 2 && memcmp(CompositeInput.data(), std::array<char, 2> { 91, 65 }.data(), 2) == 0) {
// UP ARROW // UP ARROW
if (!ConsoleHistory.empty()) { if (!ConsoleHistory.empty()) {
if (ConsoleHistoryReadIndex != 0) { if (ConsoleHistoryReadIndex != 0) {
@ -137,7 +137,7 @@ static void ProcessCompositeInput() {
} }
CInputBuff = ConsoleHistory.at(ConsoleHistoryReadIndex); CInputBuff = ConsoleHistory.at(ConsoleHistoryReadIndex);
} }
} else if (memcmp(CompositeInput.data(), std::array<char, 2> { 91, 66 }.data(), 2) == 0) { } else if (CompositeInput.size() == 2 && memcmp(CompositeInput.data(), std::array<char, 2> { 91, 66 }.data(), 2) == 0) {
// DOWN ARROW // DOWN ARROW
if (!ConsoleHistory.empty()) { if (!ConsoleHistory.empty()) {
if (ConsoleHistoryReadIndex != ConsoleHistory.size() - 1) { if (ConsoleHistoryReadIndex != ConsoleHistory.size() - 1) {