Fix memory leak in talkaction #2145
Merged
Conversation
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
That was my mistake when changing it to list of objs instead of pointers.
Editing through github :x
ranisalt
reviewed
Feb 1, 2017
src/talkaction.cpp
Outdated
| @@ -61,7 +61,9 @@ Event* TalkActions::getEvent(const std::string& nodeName) | |||
|
|
|||
| bool TalkActions::registerEvent(Event* event, const pugi::xml_node&) | |||
| { | |||
| talkActions.push_front(*static_cast<TalkAction*>(event)); // event is guaranteed to be a TalkAction | |||
| TalkAction* talkAction = static_cast<TalkAction*>(event); // event is guaranteed to be a TalkAction | |||
| talkActions.push_front(*talkAction); | |||
There was a problem hiding this comment.
std::move(*talkaction) might use less resources than copying here. Also I'd use an unique_ptr for clean pointer handling.
auto talkaction = std::unique_ptr<Talkaction>(*event);
talkactions.push_front(std::move(*talkaction.get()));
ranisalt
requested changes
Feb 2, 2017
src/talkaction.cpp
Outdated
| @@ -61,7 +61,8 @@ Event* TalkActions::getEvent(const std::string& nodeName) | |||
|
|
|||
| bool TalkActions::registerEvent(Event* event, const pugi::xml_node&) | |||
| { | |||
| talkActions.push_front(*static_cast<TalkAction*>(event)); // event is guaranteed to be a TalkAction | |||
| auto talkAction = std::unique_ptr<TalkAction>(static_cast<TalkAction*>(event)); // event is guaranteed to be a TalkAction | |||
| talkActions.push_front(std::move(*talkAction.get())); | |||
There was a problem hiding this comment.
Just noticed you can use *talkAction, .get() is redundant (source)
There was a problem hiding this comment.
I'd rather use get to emphasize is not a normal pointer
ranisalt
approved these changes
Feb 2, 2017
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
That was my mistake when changing it to list of objs instead of pointers.