From 79f5ea04744a50c006067800d506211553757387 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 17 Aug 2020 17:30:06 -0700 Subject: [PATCH] initialize some variables which need to be --- Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp | 2 +- Source/Core/Core/IOS/Network/IP/Top.cpp | 16 +++++++--------- Source/Core/Core/PowerPC/PPCSymbolDB.cpp | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp b/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp index 75b9edb5ea..1b4a47433b 100644 --- a/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp +++ b/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp @@ -198,7 +198,7 @@ bool CEXIETHERNET::TAPNetworkInterface::Activate() } /* get driver version info */ - ULONG info[3]; + ULONG info[3]{}; if (DeviceIoControl(mHAdapter, TAP_IOCTL_GET_VERSION, &info, sizeof(info), &info, sizeof(info), &len, nullptr)) { diff --git a/Source/Core/Core/IOS/Network/IP/Top.cpp b/Source/Core/Core/IOS/Network/IP/Top.cpp index 5f8ee3282a..2cd38142fd 100644 --- a/Source/Core/Core/IOS/Network/IP/Top.cpp +++ b/Source/Core/Core/IOS/Network/IP/Top.cpp @@ -86,13 +86,12 @@ static constexpr u32 inet_addr(u8 a, u8 b, u8 c, u8 d) static int inet_pton(const char* src, unsigned char* dst) { - int saw_digit, octets; + int saw_digit = 0; + int octets = 0; + unsigned char tmp[4]{}; + unsigned char* tp = tmp; char ch; - unsigned char tmp[4], *tp; - saw_digit = 0; - octets = 0; - *(tp = tmp) = 0; while ((ch = *src++) != '\0') { if (ch >= '0' && ch <= '9') @@ -927,8 +926,9 @@ IPCCommandResult NetIPTop::HandleRecvFromRequest(const IOCtlVRequest& request) IPCCommandResult NetIPTop::HandleGetAddressInfoRequest(const IOCtlVRequest& request) { addrinfo hints; + const bool hints_valid = request.in_vectors.size() > 2 && request.in_vectors[2].size; - if (request.in_vectors.size() > 2 && request.in_vectors[2].size) + if (hints_valid) { hints.ai_flags = Memory::Read_U32(request.in_vectors[2].address); hints.ai_family = Memory::Read_U32(request.in_vectors[2].address + 0x4); @@ -959,9 +959,7 @@ IPCCommandResult NetIPTop::HandleGetAddressInfoRequest(const IOCtlVRequest& requ } addrinfo* result = nullptr; - int ret = getaddrinfo( - pNodeName, pServiceName, - (request.in_vectors.size() > 2 && request.in_vectors[2].size) ? &hints : nullptr, &result); + int ret = getaddrinfo(pNodeName, pServiceName, hints_valid ? &hints : nullptr, &result); u32 addr = request.io_vectors[0].address; u32 sockoffset = addr + 0x460; if (ret == 0) diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp index fc02b54bbb..30a2f5b857 100644 --- a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp +++ b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp @@ -247,7 +247,7 @@ bool PPCSymbolDB::LoadMap(const std::string& filename, bool bad) continue; } - char temp[256]; + char temp[256]{}; sscanf(line, "%255s", temp); if (strcmp(temp, "UNUSED") == 0)