diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2022-09-24 20:30:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-24 20:30:46 +0200 |
| commit | f106bc150a9deac2cef85ff3fef56a5bdb2522d3 (patch) | |
| tree | 1299cca6195d4a2adbba2f13a4458824cdaf3e45 /Source | |
| parent | 63975556a4dd7766b14e28ce9b0f440efe288d6f (diff) | |
| parent | 34858e934fd8bc60a7b5756c86e631eebdba9242 (diff) | |
Merge pull request #11083 from sepalani/bba-check
BBA/BuiltIn: Fix a crash during network stack exhaustion
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp b/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp index d0b169da71..4dfc0a30ee 100644 --- a/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp +++ b/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp @@ -510,7 +510,7 @@ void CEXIETHERNET::BuiltInBBAInterface::HandleUDPFrame(const Common::UDPPacket& void CEXIETHERNET::BuiltInBBAInterface::HandleUPnPClient() { StackRef* ref = GetAvailableSlot(0); - if (m_upnp_httpd.accept(ref->tcp_socket) != sf::Socket::Done) + if (ref == nullptr || m_upnp_httpd.accept(ref->tcp_socket) != sf::Socket::Done) return; if (ref->tcp_socket.GetPeerName(&ref->from) != sf::Socket::Status::Done || @@ -520,6 +520,13 @@ void CEXIETHERNET::BuiltInBBAInterface::HandleUPnPClient() return; } + if (m_current_ip == ref->from.sin_addr.s_addr) + { + ref->tcp_socket.disconnect(); + WARN_LOG_FMT(SP1, "Ignoring UPnP request to itself"); + return; + } + ref->delay = GetTickCountStd(); ref->ip = ref->from.sin_addr.s_addr; ref->local = ref->to.sin_port; |