izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Replace magic number 15 with a MAX_IPV4_STRING_LENGTH constant.

Browse Source
This commit is contained in:
Jordan Woyak
2026-02-04 19:38:53 -06:00
parent fd31a21c14
commit 3e8a1fa5e6
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/Core/HW/DVD/AMMediaboard.cpp
+9 -6
View File
@@ -95,6 +95,8 @@ static u8 s_network_buffer[512 * 1024];
static u8 s_allnet_buffer[4096];
static u8 s_allnet_settings[0x8500];
static constexpr size_t MAX_IPV4_STRING_LENGTH = 15;
constexpr char s_allnet_reply[] = {
"uri=http://"
"sega.com&host=sega.com&nickname=sega&name=sega&year=2025&month=08&day=16&hour=21&minute=10&"
@@ -872,7 +874,8 @@ u32 ExecuteCommand(std::array<u32, 3>& dicmd_buf, u32* diimm_buf, u32 address, u
const char* ip_address = reinterpret_cast<char*>(s_network_command_buffer);
// IP address shouldn't be longer than 15
if (strnlen(ip_address, 15) > 15)
// TODO: Shouldn't this look at 16 characters for lack of null-termination?
if (strnlen(ip_address, MAX_IPV4_STRING_LENGTH) > MAX_IPV4_STRING_LENGTH)
{
ERROR_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: Invalid size for address: InetAddr():{}\n",
strlen(ip_address));
@@ -1047,7 +1050,7 @@ u32 ExecuteCommand(std::array<u32, 3>& dicmd_buf, u32* diimm_buf, u32 address, u
}
const int ret =
select(fd + 1, readfds, writefds, exceptfds, timeout_src ? &timeout : nullptr);
select(fd + 1, readfds, writefds, exceptfds, timeout_offset ? &timeout : nullptr);
const int err = WSAGetLastError();
@@ -1145,7 +1148,7 @@ u32 ExecuteCommand(std::array<u32, 3>& dicmd_buf, u32* diimm_buf, u32 address, u
{
const u32 net_buffer_offset = s_media_buffer_32[2] - NetworkCommandAddress2;
if (!NetworkCMDBufferCheck(net_buffer_offset, 15))
if (!NetworkCMDBufferCheck(net_buffer_offset, MAX_IPV4_STRING_LENGTH))
{
break;
}
@@ -1154,7 +1157,7 @@ u32 ExecuteCommand(std::array<u32, 3>& dicmd_buf, u32* diimm_buf, u32 address, u
reinterpret_cast<char*>(s_network_command_buffer + net_buffer_offset);
NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: modifyMyIPaddr({})\n",
fmt::string_view(ip_address, 15));
fmt::string_view(ip_address, MAX_IPV4_STRING_LENGTH));
break;
}
case AMMBCommand::GetLastError:
@@ -1676,7 +1679,7 @@ u32 ExecuteCommand(std::array<u32, 3>& dicmd_buf, u32* diimm_buf, u32 address, u
{
const u32 net_buffer_offset = s_media_buffer_32[10] - NetworkCommandAddress1;
if (!NetworkCMDBufferCheck(net_buffer_offset, 15))
if (!NetworkCMDBufferCheck(net_buffer_offset, MAX_IPV4_STRING_LENGTH))
{
break;
}
@@ -1685,7 +1688,7 @@ u32 ExecuteCommand(std::array<u32, 3>& dicmd_buf, u32* diimm_buf, u32 address, u
reinterpret_cast<char*>(s_network_command_buffer + net_buffer_offset);
NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: modifyMyIPaddr({})\n",
fmt::string_view(ip_address, 15));
fmt::string_view(ip_address, MAX_IPV4_STRING_LENGTH));
}
break;
// Empty reply