read-cache: use of memory after it is freed
diff mbox series

Message ID 20181020073334.48348-1-carenas@gmail.com
State New
Headers show
Series
  • read-cache: use of memory after it is freed
Related show

Commit Message

Carlo Marcelo Arenas Belón Oct. 20, 2018, 7:33 a.m. UTC
introduced with c46c406ae1e (trace.h: support nested performance tracing)
on Aug 18, 2018 but not affecting maint

Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
 read-cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Duy Nguyen Oct. 20, 2018, 3:15 p.m. UTC | #1
On Sat, Oct 20, 2018 at 9:33 AM Carlo Marcelo Arenas Belón
<carenas@gmail.com> wrote:
>
> introduced with c46c406ae1e (trace.h: support nested performance tracing)
> on Aug 18, 2018 but not affecting maint
>
> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
> ---
>  read-cache.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/read-cache.c b/read-cache.c
> index 1df5c16dbc..78f47d2f50 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -2297,8 +2297,8 @@ int read_index_from(struct index_state *istate, const char *path,
>         freshen_shared_index(base_path, 0);
>         merge_base_index(istate);
>         post_read_index_from(istate);
> -       free(base_path);
>         trace_performance_leave("read cache %s", base_path);
> +       free(base_path);

Oops. Ack.

>         return ret;
>  }
>
> --
> 2.19.1
>
Junio C Hamano Oct. 22, 2018, 3:39 a.m. UTC | #2
Duy Nguyen <pclouds@gmail.com> writes:

>>         freshen_shared_index(base_path, 0);
>>         merge_base_index(istate);
>>         post_read_index_from(istate);
>> -       free(base_path);
>>         trace_performance_leave("read cache %s", base_path);
>> +       free(base_path);
>
> Oops. Ack.

Thanks, both.

>> introduced with c46c406ae1e (trace.h: support nested performance tracing)
>> on Aug 18, 2018 but not affecting maint

Yup.  The series nd/unpack-trees-with-cache-tree however was
designed to be merge-able down to 'maint', so it is a good idea to
fix this at the tip of the topic.  So I'll queue it on top of
5f4436a7 ("Document update for nd/unpack-trees-with-cache-tree",
2018-08-25).

Patch
diff mbox series

diff --git a/read-cache.c b/read-cache.c
index 1df5c16dbc..78f47d2f50 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -2297,8 +2297,8 @@  int read_index_from(struct index_state *istate, const char *path,
 	freshen_shared_index(base_path, 0);
 	merge_base_index(istate);
 	post_read_index_from(istate);
-	free(base_path);
 	trace_performance_leave("read cache %s", base_path);
+	free(base_path);
 	return ret;
 }