bisect--helper: refer branch.buf before strbuf_release(...)
PATCH 1/1 bisect--helper: refer branch.buf before strbuf_release(...)
From: Tanushree Tumane <[email protected]>
Move error("...%s...", branch.buf); before strbuf_release(&branch); to release string buffer branch and the memory it used.
--- builtin/bisect--helper.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
builtin/bisect--helper.c +4 -3
@@ -169,11 +169,12 @@ static int bisect_reset(const char *commit)argv_array_pushl (&argv,"checkout" , branch.buf,"--" ,NULL );if (run_command_v_opt (argv.argv,RUN_GIT_CMD )) { +error (_ ("could not check out original" +" HEAD '%s'. Try 'git bisect" +" reset <commit>'." ), branch.buf);strbuf_release (&branch);argv_array_clear (&argv); -return error (_ ("could not check out original" -" HEAD '%s'. Try 'git bisect" -" reset <commit>'." ), branch.buf); +return -1 ; }argv_array_clear (&argv); }
Signature · 1 line
2.21.0 (Apple Git-122.2)
Hi Miriam,
welcome to the Git project!
Quoted 1 line · Miriam Rubio
From: Tanushree Tumane <[email protected]>
Is this really a patch authored by Tanushree, or is this a fix written by you, intended to fix a patch authored by Tanushree?
If it is the latter, please use a completely new commit message and take the authorship yourself.
Quoted 2 lines
Move
error("...%s...", branch.buf);beforestrbuf_release(&branch);to release string bufferbranchand the memory it used.
This describes the "what?", but the patch already does that. The commit message should be more about the "why?".
In this instance, I believe that the commit message should read more like this:
-- snip --
bisect--helper: avoid free-after-use
In 5e82c3dd22a (bisect--helper: bisect_reset shell function in C, 2019-01-02), the git bisect reset subcommand was ported to C. When the call to git checkout failed, an error message was reported to the user.
However, this error message used the strbuf that had just been released already. Let's switch that around: first use it, then release it.
-- snap --
Quoted 16 lines
Mentored-by Johannes Schindelin <[email protected]>Mentored-by Christian Couder <[email protected]>Signed-off-by Tanushree Tumane <[email protected]>Signed-off-by Miriam Rubio <[email protected]>--- builtin/bisect--helper.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)builtin/bisect--helper.c +0
-0@@ -169,11 +169,12 @@ static int bisect_reset(const char *commit)argv_array_pushl (&argv,"checkout" , branch.buf,"--" ,NULL );
builtin/bisect--helper.c static int bisect_reset(const char *commit) · line 177
Quoted 10 lines
builtin/bisect--helper.c +4
-3if (run_command_v_opt (argv.argv,RUN_GIT_CMD )) { +error (_ ("could not check out original" +" HEAD '%s'. Try 'git bisect" +" reset <commit>'." ), branch.buf);strbuf_release (&branch);argv_array_clear (&argv); -return error (_ ("could not check out original" -" HEAD '%s'. Try 'git bisect" -" reset <commit>'." ), branch.buf); +return -1 ;
The patch looks good.
Thanks!
Johannes
Quoted 7 lines
builtin/bisect--helper.c +0
-1}argv_array_clear (&argv); } --2.21.0 (Apple Git-122.2)
Quoted 5 lines · Johannes Schindelin
Hi Miriam,
welcome to the Git project!
Thank you! :)
Quoted 7 lines · Miriam Rubio
Quoted 2 lines
From: Tanushree Tumane <[email protected]>
Is this really a patch authored by Tanushree, or is this a fix written by you, intended to fix a patch authored by Tanushree?
This is really a patch authored by Tanushree.
Quoted 20 lines
If it is the latter, please use a completely new commit message and take the authorship yourself.
Quoted 2 lines
Move
error("...%s...", branch.buf);beforestrbuf_release(&branch);to release string bufferbranchand the memory it used.This describes the "what?", but the patch already does that. The commit message should be more about the "why?".
In this instance, I believe that the commit message should read more like this:
-- snip --
bisect--helper: avoid free-after-useIn
5e82c3dd22a(bisect--helper:bisect_resetshell function in C, 2019-01-02), thegit bisect resetsubcommand was ported to C. When the call togit checkoutfailed, an error message was reported to the user.
Quoted 7 lines
However, this error message used the
strbufthat had just been released already. Let's switch that around: first use it, then release it.Signed-off-by Miriam Rubio <[email protected]>-- snap --
Ok! Thank you for your advice with the message.
Quoted 15 lines
Quoted 15 lines
Mentored-by Johannes Schindelin <[email protected]>Mentored-by Christian Couder <[email protected]>Signed-off-by Tanushree Tumane <[email protected]>Signed-off-by Miriam Rubio <[email protected]>--- builtin/bisect--helper.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)builtin/bisect--helper.c +0
-0@@ -169,11 +169,12 @@ static int bisect_reset(const char *commit)
Quoted 14 lines
builtin/bisect--helper.c static int bisect_reset(const char *commit) · line 177
Quoted 11 lines
builtin/bisect--helper.c +4
-3argv_array_pushl (&argv,"checkout" , branch.buf,"--" ,NULL );if (run_command_v_opt (argv.argv,RUN_GIT_CMD )) { +error (_ ("could not check out original" +" HEAD '%s'. Try 'git bisect" +" reset <commit>'." ), branch.buf);strbuf_release (&branch);argv_array_clear (&argv); -return error (_ ("could not check out original" -" HEAD '%s'. Try 'git bisect" -" reset <commit>'." ), branch.buf); +return -1 ;The patch looks good.
Great :). I'll change the commit message and I'll resend the patch.
Quoted 2 lines
Thanks!
Johannes
Thanks,
Miriam
Quoted 8 lines
Quoted 8 lines
builtin/bisect--helper.c +0
-1}argv_array_clear (&argv); } --2.21.0 (Apple Git-122.2)