Skip to content

Fix: Null reference in friend request removal and await async helper #2

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

Closed
seer-by-sentry wants to merge 1 commit into from
Closed

Fix: Null reference in friend request removal and await async helper #2

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
13 changes: 10 additions & 3 deletions GenOnlineService/Controllers/Friends/SocialController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,13 @@ private async Task HelperFunction_AcceptFriendRequest(Int64 source_user_id, Int6
UserSession? targetData = WebSocketManager.GetDataFromUser(target_user_id);

// remove the request from requestor (online version)
// If source user is not online, we cannot proceed
if (sourceData == null)
{
return;
}


#pragma warning disable CS8602 // Dereference of a possibly null reference.
sourceData.GetSocialContainer().PendingRequests.Remove(target_user_id);
#pragma warning restore CS8602 // Dereference of a possibly null reference.
Expand Down Expand Up @@ -147,7 +154,7 @@ public async Task AcceptPendingRequest(Int64 target_user_id)
return;
}

HelperFunction_AcceptFriendRequest(source_user_id, target_user_id);
await HelperFunction_AcceptFriendRequest(source_user_id, target_user_id);

UserSession? sourceSession = WebSocketManager.GetDataFromUser(source_user_id);
if (sourceSession != null)
Expand Down Expand Up @@ -319,7 +326,7 @@ public async Task AddFriend(Int64 target_user_id)
if (userData.GetSocialContainer().PendingRequests.Contains(target_user_id))
{
// accept their request
HelperFunction_AcceptFriendRequest(requester_user_id, target_user_id);
await HelperFunction_AcceptFriendRequest(requester_user_id, target_user_id);
}
else
{
Expand Down Expand Up @@ -628,4 +635,4 @@ public async Task Remove_Block(Int64 target_user_id)
}
}
}
}
}
Expand Down