Don't leak the last argument expanded by expandNextArg()#4
Open
vathpela wants to merge 1 commit intodevzero2000:masterfrom
Open
Don't leak the last argument expanded by expandNextArg()#4vathpela wants to merge 1 commit intodevzero2000:masterfrom
vathpela wants to merge 1 commit intodevzero2000:masterfrom
Conversation
While using POPT_ARG_ARGV, I noticed this in valgrind's leak checker: ==1738== HEAP SUMMARY: ==1738== in use at exit: 8 bytes in 1 blocks ==1738== total heap usage: 94 allocs, 93 frees, 42,319 bytes allocated ==1738== ==1738== 8 bytes in 1 blocks are definitely lost in loss record 1 of 1 ==1738== at 0x4C2EB6B: malloc (vg_replace_malloc.c:299) ==1738== by 0x4E3DF47: expandNextArg (popt.c:699) ==1738== by 0x4E3F681: poptGetNextOpt (popt.c:1501) ==1738== by 0x401F72: main (bingrep.c:433) ==1738== ==1738== LEAK SUMMARY: ==1738== definitely lost: 8 bytes in 1 blocks ==1738== indirectly lost: 0 bytes in 0 blocks ==1738== possibly lost: 0 bytes in 0 blocks ==1738== still reachable: 0 bytes in 0 blocks ==1738== suppressed: 0 bytes in 0 blocks My command line argument is a 7-byte string, and on first glance, it appears this is because both expandNextArg() and poptSaveString() duplicate the string. The copy from poptSaveString() is the consuming program's responsibility to free, but the intermediate pointer is popt's responsibility. Upon further examination, it appears popt normally does free this string, but it only does it on the next entry to poptGetNextOpt(), and on cleanOSE() in the case if we're not already at the bottom of con->OptionStack. This patch modifies poptResetContext() to ensure we'll always attempt to free con->os->nextArg regardless of our position in the OptionStack, and removes the duplicate free of con->os->argb in poptFreeContext(), as it's called unconditionally by the poptResetContext() call on the previous line. This ensures that if poptGetNextOpt() isn't re-intered, poptFreeContext() will free the memory that was allocated. Now valgrind tells me: ==31734== HEAP SUMMARY: ==31734== in use at exit: 0 bytes in 0 blocks ==31734== total heap usage: 94 allocs, 94 frees, 42,319 bytes allocated ==31734== ==31734== All heap blocks were freed -- no leaks are possible Signed-off-by: Peter Jones <pjones@redhat.com>
This file contains hidden or 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
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.
While using POPT_ARG_ARGV, I noticed this in valgrind's leak checker:
==1738== HEAP SUMMARY:
==1738== in use at exit: 8 bytes in 1 blocks
==1738== total heap usage: 94 allocs, 93 frees, 42,319 bytes allocated
==1738==
==1738== 8 bytes in 1 blocks are definitely lost in loss record 1 of 1
==1738== at 0x4C2EB6B: malloc (vg_replace_malloc.c:299)
==1738== by 0x4E3DF47: expandNextArg (popt.c:699)
==1738== by 0x4E3F681: poptGetNextOpt (popt.c:1501)
==1738== by 0x401F72: main (bingrep.c:433)
==1738==
==1738== LEAK SUMMARY:
==1738== definitely lost: 8 bytes in 1 blocks
==1738== indirectly lost: 0 bytes in 0 blocks
==1738== possibly lost: 0 bytes in 0 blocks
==1738== still reachable: 0 bytes in 0 blocks
==1738== suppressed: 0 bytes in 0 blocks
My command line argument is a 7-byte string, and on first glance, it
appears this is because both expandNextArg() and poptSaveString()
duplicate the string. The copy from poptSaveString() is the consuming
program's responsibility to free, but the intermediate pointer is popt's
responsibility.
Upon further examination, it appears popt normally does free this
string, but it only does it on the next entry to poptGetNextOpt(), and
on cleanOSE() in the case if we're not already at the bottom of
con->OptionStack.
This patch modifies poptResetContext() to ensure we'll always attempt to
free con->os->nextArg regardless of our position in the OptionStack, and
removes the duplicate free of con->os->argb in poptFreeContext(), as
it's called unconditionally by the poptResetContext() call on the
previous line.
This ensures that if poptGetNextOpt() isn't re-intered, poptFreeContext()
will free the memory that was allocated. Now valgrind tells me:
==31734== HEAP SUMMARY:
==31734== in use at exit: 0 bytes in 0 blocks
==31734== total heap usage: 94 allocs, 94 frees, 42,319 bytes allocated
==31734==
==31734== All heap blocks were freed -- no leaks are possible
Signed-off-by: Peter Jones pjones@redhat.com