git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] am: check return value of resolve_refdup before using hash

From
Jeff King <peff@peff.net>
Date
May 9, 2017, 03:58 UTC
Message-ID
<20170509035807.2q7bzhu7cs4fcqkb@sigill.intra.peff.net>
In-Reply-To
<f0ca65bf-aaf9-2cd6-1deb-c55c9e7a8fa3@web.de>
On Sat, May 06, 2017 at 07:13:56PM +0200, René Scharfe wrote:
Show 21 quoted lines
> If resolve_refdup() fails it returns NULL and possibly leaves its hash
> output parameter untouched.  Make sure to use it only if the function
> succeeded, in order to avoid accessing uninitialized memory.
> 
> Signed-off-by: Rene Scharfe <l.s.r@web.de>
> ---
>  builtin/am.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/builtin/am.c b/builtin/am.c
> index a95dd8b4e6..2c52c820aa 100644
> --- a/builtin/am.c
> +++ b/builtin/am.c
> @@ -2156,7 +2156,7 @@ static void am_abort(struct am_state *state)
>  	am_rerere_clear();
>  
>  	curr_branch = resolve_refdup("HEAD", 0, curr_head.hash, NULL);
> -	has_curr_head = !is_null_oid(&curr_head);
> +	has_curr_head = curr_branch && !is_null_oid(&curr_head);
>  	if (!has_curr_head)
>  		hashcpy(curr_head.hash, EMPTY_TREE_SHA1_BIN);

This one looks good to me (and no interesting ripple effects from handling the error correctly :) ).

-Peff
Previous: René Scharfe
Message 2 of 2 in “am: check return value of resolve_refdup before using hash”
  1. am: check return value of resolve_refdup before using hashRené Scharfe, May 6, 2017
  2. Jeff KingMay 9, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.