Fix memory leaks and improve error code path #6
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
|
Nice catch! Is there anyway of avoiding GOTO while still doing all the fancy refactoring and leak-stopping? GOTO rubs me the wrong way even though this was one of the nicest GOTO I've seen in quite some time. |
We forgot to call `sparkey_logiter_close(&logiter);` in four code paths leaking memory. This commit refactors the error paths for `method_logreader_each` and `method_hash_each` to use common error handling logic instead of duplicating code. This also makes it easier to see what is deallocated and fixes the leaks mentioned above.
charignon
force-pushed
the
lc/improve_failure_dealloc_and_fix_leak
branch
from
e86dc4a to
3d8967b
Compare
|
I sent a version without GOTO using a function, let me know what you think @emnl. |
|
Could you please take a look @emnl ? |
|
@emnl ? |
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.
Description
This commit refactors the error paths for
method_logreader_eachandmethod_hash_eachto use common errorhandling logic instead of duplicating code. In these error paths we forgot to call
sparkey_logiter_close(&logiter);, leaking memory. This refactoring, makes it easier tosee what is deallocated and fixes the leaks mentioned above.
I added the
return Qnil;to both functions to avoid compiler warning on reaching the end of non a void function without a return value.Test Plan
I compiled the code and ran the unit tests.