Skip to content

Fix use-after-free of FSocketIONative from its own game-thread callbacks #462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marekl11 wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −19
Open

Fix use-after-free of FSocketIONative from its own game-thread callbacks #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 45 additions & 18 deletions Source/SocketIOClient/Private/SocketIONative.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,11 +501,18 @@ void FSocketIONative::SetupInternalCallbacks()
{
if (bCallbackOnGameThread)
{
FCULambdaRunnable::RunShortLambdaOnGameThread([&, DisconnectReason]
// Capture a weak ref to self instead of `this`: this lambda runs later on the
// game thread, by which point the FSocketIONative may have been released (e.g.
// during a level transition). Pin() safely no-ops if it's gone.
TWeakPtr<FSocketIONative> WeakSelf = AsShared();
FCULambdaRunnable::RunShortLambdaOnGameThread([WeakSelf, DisconnectReason]
{
if (OnDisconnectedCallback)
if (TSharedPtr<FSocketIONative> Self = WeakSelf.Pin())
{
OnDisconnectedCallback(DisconnectReason);
if (Self->OnDisconnectedCallback)
{
Self->OnDisconnectedCallback(DisconnectReason);
}
}
});
}
Expand Down Expand Up @@ -537,11 +544,15 @@ void FSocketIONative::SetupInternalCallbacks()
{
if (bCallbackOnGameThread)
{
FCULambdaRunnable::RunShortLambdaOnGameThread([&]
TWeakPtr<FSocketIONative> WeakSelf = AsShared();
FCULambdaRunnable::RunShortLambdaOnGameThread([WeakSelf]
{
if (OnConnectedCallback)
if (TSharedPtr<FSocketIONative> Self = WeakSelf.Pin())
{
OnConnectedCallback(SocketId, SessionId);
if (Self->OnConnectedCallback)
{
Self->OnConnectedCallback(Self->SocketId, Self->SessionId);
}
}
});
}
Expand All @@ -562,11 +573,15 @@ void FSocketIONative::SetupInternalCallbacks()
{
if (bCallbackOnGameThread)
{
FCULambdaRunnable::RunShortLambdaOnGameThread([&, Namespace]
TWeakPtr<FSocketIONative> WeakSelf = AsShared();
FCULambdaRunnable::RunShortLambdaOnGameThread([WeakSelf, Namespace]
{
if (OnNamespaceConnectedCallback)
if (TSharedPtr<FSocketIONative> Self = WeakSelf.Pin())
{
OnNamespaceConnectedCallback(Namespace);
if (Self->OnNamespaceConnectedCallback)
{
Self->OnNamespaceConnectedCallback(Namespace);
}
}
});
}
Expand All @@ -593,11 +608,15 @@ void FSocketIONative::SetupInternalCallbacks()
{
if (bCallbackOnGameThread)
{
FCULambdaRunnable::RunShortLambdaOnGameThread([&, Namespace]
TWeakPtr<FSocketIONative> WeakSelf = AsShared();
FCULambdaRunnable::RunShortLambdaOnGameThread([WeakSelf, Namespace]
{
if (OnNamespaceDisconnectedCallback)
if (TSharedPtr<FSocketIONative> Self = WeakSelf.Pin())
{
OnNamespaceDisconnectedCallback(Namespace);
if (Self->OnNamespaceDisconnectedCallback)
{
Self->OnNamespaceDisconnectedCallback(Namespace);
}
}
});
}
Expand All @@ -618,11 +637,15 @@ void FSocketIONative::SetupInternalCallbacks()
{
if (bCallbackOnGameThread)
{
FCULambdaRunnable::RunShortLambdaOnGameThread([&]
TWeakPtr<FSocketIONative> WeakSelf = AsShared();
FCULambdaRunnable::RunShortLambdaOnGameThread([WeakSelf]
{
if (OnFailCallback)
if (TSharedPtr<FSocketIONative> Self = WeakSelf.Pin())
{
OnFailCallback();
if (Self->OnFailCallback)
{
Self->OnFailCallback();
}
}
});
}
Expand All @@ -645,11 +668,15 @@ void FSocketIONative::SetupInternalCallbacks()
{
if (bCallbackOnGameThread)
{
FCULambdaRunnable::RunShortLambdaOnGameThread([&, num, delay]
TWeakPtr<FSocketIONative> WeakSelf = AsShared();
FCULambdaRunnable::RunShortLambdaOnGameThread([WeakSelf, num, delay]
{
if (OnReconnectionCallback)
if (TSharedPtr<FSocketIONative> Self = WeakSelf.Pin())
{
OnReconnectionCallback(num, delay);
if (Self->OnReconnectionCallback)
{
Self->OnReconnectionCallback(num, delay);
}
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion Source/SocketIOClient/Public/SocketIONative.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct FSIOBoundEvent
}
};

class SOCKETIOCLIENT_API FSocketIONative
class SOCKETIOCLIENT_API FSocketIONative : public TSharedFromThis<FSocketIONative>
{
public:
/** By default TLS verification is off. TLS mode will be set by URL on connect.*/
Expand Down