ENetUtil: Add check for valid socket in SendPacket(). #11526
Merged
+6
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Rumi-Larry
reviewed
Feb 2, 2023
Source/Core/Common/ENetUtil.cpp
Outdated
| @@ -39,6 +39,12 @@ int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event) | |||
|
|
|||
| bool SendPacket(ENetPeer* socket, const sf::Packet& packet, u8 channel_id) | |||
| { | |||
| if (!socket) | |||
| { | |||
| ERROR_LOG_FMT(NETPLAY, "No socket to send to given."); | |||
There was a problem hiding this comment.
Suggested change
| ERROR_LOG_FMT(NETPLAY, "No socket to send to given."); | |
| ERROR_LOG_FMT(NETPLAY, "No socket to send to, given."); |
There was a problem hiding this comment.
This suggestion makes no sense.
There was a problem hiding this comment.
I disagree, without the comma, it seems like you are trying to send a socket to given.
There was a problem hiding this comment.
I see what you mean but that's not how English grammar works. There's probably a better way to phrase this that's clearer.
|
Anyone opposed to merging this? It's not really a fix to the issue but it still prevents a potential crash. |
AdmiralCurtiss
force-pushed
the
netplay-crash
branch
from
52365b2
to
2f6e7d4
Compare
|
I merged this so the user on Discord that this report is from can report back whether this helps them in any way, and maybe provide more info about the actual underlying issue now that Dolphin doesn't crash when this happens. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
I got a crash report on Discord yesterday that I traced back to here.
Unfortunately this isn't a real fix, more like a bandaid. I'm guessing what actually happens is that
m_serverinNetPlayClientbecomes null through a disconnect but something is still trying to send stuff afterwards, but the stack in the crashdump I have looks borked so I'm not actually sure.