Skip to content
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.

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

Jump to bottom

Codechange: ensure OnConnect() always gets called with a valid socket #9729

Merged
merged 1 commit into from Dec 4, 2021
Merged

Codechange: ensure OnConnect() always gets called with a valid socket #9729

merged 1 commit into from Dec 4, 2021

Conversation

TrueBrain
Copy link
Member

Motivation / Problem

The backtrace in #9728 is odd to me. The only reason I can think of that this->sock is INVALID_SOCKET is when the OnConnect already indicated this. That should never happen, but two flows in the code didn't validate for it (where the other two we have did). Neither should ever be INVALID_SOCKET, but should/would/could.

Description

This should already be the case, but now assert()s will tell us
if this isn't.

This might help uncover where in #9728 the socket becomes INVALID_SOCKET.

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@TrueBrain
Codechange: ensure OnConnect() always gets called with a valid socket
58400bb 
This should already be the case, but now assert()s will tell us
if this isn't.
@TrueBrain TrueBrain mentioned this pull request Dec 4, 2021
Closed
@TrueBrain TrueBrain merged commit 9c36c12 into OpenTTD:master Dec 4, 2021
@TrueBrain TrueBrain deleted the harden-network-socket branch December 4, 2021 17:32
@TrueBrain TrueBrain added the backport requested This PR should be backport to current release (RC / stable) label Jan 1, 2022
TrueBrain added a commit to TrueBrain/OpenTTD that referenced this pull request Jan 3, 2022
@TrueBrain
Codechange: ensure OnConnect() always gets called with a valid socket (…
7f7c00a 
…OpenTTD#9729)

This should already be the case, but now assert()s will tell us
if this isn't.
@TrueBrain TrueBrain mentioned this pull request Jan 3, 2022
Merged
TrueBrain added a commit that referenced this pull request Jan 5, 2022
@TrueBrain
Codechange: ensure OnConnect() always gets called with a valid socket (…
8aaed83 
…#9729)

This should already be the case, but now assert()s will tell us
if this isn't.
@TrueBrain TrueBrain added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Jan 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frosch123 frosch123 frosch123 approved these changes

Assignees
No one assigned
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@TrueBrain @frosch123