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

socket: fix potential double close #2663

Merged
merged 1 commit into from
Jun 24, 2024
Merged

Conversation

BusyJay
Copy link
Contributor

@BusyJay BusyJay commented Jun 12, 2024

What problem does this PR solve?

Problem Summary:

_fd should be reset if ResetFileDescriptor is going to return -1, otherwise the fd will be closed in callers like CheckConnectedAndKeepWrite or Server::StartInernal and socket lifecycle methods like BeforeRecycled or WaitAndReset.

What is changed and the side effects?

Changed:

Side effects:

  • Performance effects(性能影响):
    No
  • Breaking backward compatibility(向后兼容性):
    No

Check List:

  • Please make sure your changes are compilable(请确保你的更改可以通过编译).
  • When providing us with a new feature, it is best to add related tests(如果你向我们增加一个新的功能, 请添加相关测试).
  • Please follow Contributor Covenant Code of Conduct.(请遵循贡献者准则).

`_fd` should be reset if `ResetFileDescriptor` is going to return -1,
otherwise the fd will be closed in callers like `CheckConnectedAndKeepWrite`
or `Server::StartInernal` and socket lifecycle methods like `BeforeRecycled`
or `WaitAndReset`.
Copy link
Contributor

@chenBright chenBright left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wwbmmm
Copy link
Contributor

wwbmmm commented Jun 15, 2024

LGTM

@chenBright chenBright merged commit f12bc52 into apache:master Jun 24, 2024
20 checks passed
@BusyJay BusyJay deleted the patch-1 branch June 24, 2024 09:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants