-
Notifications
You must be signed in to change notification settings - Fork 101
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
Fix TCPSocket constructor exception safety #112
Open
tsr-boxbot
wants to merge
1
commit into
nimbuscontrols:master
Choose a base branch
from
tsr-boxbot:tyler/SocketCleanup
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,6 +43,29 @@ namespace eipScanner { | |
} | ||
#endif | ||
|
||
//once _sockedFd turns out to be a value not less than zero then | ||
//we have to free it via a shutdown/close pair. Normally the destructor | ||
//for the TCPSocket object would do that; however if a throw happens in this | ||
//constructor then the destructor isn't called. Therefore we need to cause | ||
//cleanup to happen ourselves in that case. | ||
class socket_scope_cleanup { | ||
private: | ||
bool should_cleanup = true; | ||
TCPSocket* socket_; | ||
public: | ||
socket_scope_cleanup(TCPSocket* socket):socket_(socket){} | ||
~socket_scope_cleanup() { | ||
if(should_cleanup) { | ||
Logger(LogLevel::DEBUG) << "Close TCP socket fd=" << _sockedFd; | ||
socket_->Shutdown(); | ||
socket_->Close(); | ||
} | ||
} | ||
void do_not_cleanup() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is not called anywhere, which means the file descriptor is always cleaned up after the constructor is finished |
||
should_cleanup = false; | ||
} | ||
} socket_scope_cleanup_instance{this}; | ||
|
||
// Set non-blocking | ||
#if defined(__unix__) || defined(__APPLE__) | ||
auto arg = fcntl(_sockedFd, F_GETFL, NULL); | ||
|
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.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.