threads / patch / 39404

patchtest_bitmap_walk: free bitmap with bitmap_free

Subject: [PATCH] test_bitmap_walk: free bitmap with bitmap_free

## tl;dr

2 messages between May 22, 2015 and May 22, 2015. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Jeff King· May 22, 2015, 00:53 UTC · lore

Commit f86a374 (pack-bitmap.c: fix a memleak, 2015-03-30) noticed that we leak the "result" bitmap. But we should use "bitmap_free" rather than straight "free", as the former remembers to free the bitmap array pointed to by the struct.

Signed-off-by: Jeff King <peff@peff.net>
---
Sorry, I should have noticed this when reviewing the original.
 pack-bitmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to pack-bitmap.c +1 −1
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 62a98cc..d64bd94 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -987,7 +987,7 @@ void test_bitmap_walk(struct rev_info *revs)
 	else
 		fprintf(stderr, "Mismatch!\n");
 
-	free(result);
+	bitmap_free(result);
 }
 
 static int rebuild_bitmap(uint32_t *reposition,
-- 
2.4.1.528.g00591e3
Stefan Beller· May 22, 2015, 16:37 UTC · re: Jeff King · lore

Re: [PATCH] test_bitmap_walk: free bitmap with bitmap_free

On Thu, May 21, 2015 at 5:53 PM, Jeff King <peff@peff.net> wrote:
Show 8 quoted lines
> Commit f86a374 (pack-bitmap.c: fix a memleak, 2015-03-30)
> noticed that we leak the "result" bitmap. But we should use
> "bitmap_free" rather than straight "free", as the former
> remembers to free the bitmap array pointed to by the struct.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> Sorry, I should have noticed this when reviewing the original.

No need to be sorry, me too. This looks good to me.

Show 19 quoted lines
>
>  pack-bitmap.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/pack-bitmap.c b/pack-bitmap.c
> index 62a98cc..d64bd94 100644
> --- a/pack-bitmap.c
> +++ b/pack-bitmap.c
> @@ -987,7 +987,7 @@ void test_bitmap_walk(struct rev_info *revs)
>         else
>                 fprintf(stderr, "Mismatch!\n");
>
> -       free(result);
> +       bitmap_free(result);
>  }
>
>  static int rebuild_bitmap(uint32_t *reposition,
> --
> 2.4.1.528.g00591e3

← back to recent threads