From 1bc399537eb974f40b76409c5a8c7a298239c141 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Mon, 21 Oct 2019 00:32:13 -0300 Subject: [PATCH] Fix C6001: using uninitialized memory --- src/openrct2/network/Network.cpp | 10 ++++++++++ src/openrct2/rct2/S6Exporter.cpp | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 2e6ffaa06c..920f71242e 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -1353,6 +1353,11 @@ void Network::BeginServerLog() { format_string(logMessage, sizeof(logMessage), STR_LOG_SERVER_STARTED, nullptr); } + else + { + logMessage[0] = '\0'; + assert(0 && "Uninitialized mode"); + } AppendServerLog(logMessage); } @@ -1376,6 +1381,11 @@ void Network::CloseServerLog() { format_string(logMessage, sizeof(logMessage), STR_LOG_SERVER_STOPPED, nullptr); } + else + { + logMessage[0] = '\0'; + assert(0 && "Uninitialized mode"); + } AppendServerLog(logMessage); _server_log_fs.close(); } diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index dd5b31094d..02cfb17c61 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -168,8 +168,8 @@ void S6Exporter::Export() auto temp = utf8_to_rct2(gS6Info.details); safe_strcpy(_s6.info.details, temp.data(), sizeof(_s6.info.details)); } - uint32_t researchedTrackPiecesA[128]; - uint32_t researchedTrackPiecesB[128]; + uint32_t researchedTrackPiecesA[128] = {}; + uint32_t researchedTrackPiecesB[128] = {}; for (int32_t i = 0; i < OBJECT_ENTRY_COUNT; i++) {