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

[PATCH v3] REFTABLE_REALLOC_ARRAY: remove this unsafe yet unused macro

From
Lidong Yan via GitGitGadget <gitgitgadget@gmail.com>
Date
May 9, 2025, 07:44 UTC
Message-ID
<pull.1955.v3.git.git.1746776686718.gitgitgadget@gmail.com>
In-Reply-To
<pull.1955.v2.git.git.1746756263207.gitgitgadget@gmail.com>
From: Lidong Yan <502024330056@smail.nju.edu.cn>

REFTABLE_REALLOC_ARRAY will cause memory leak if realloc failed. Since it is unused, remove this unsafe macro.

Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn>
---
    REFTABLE_REALLOC_ARRAY: fix potential memory leak if realloc failed
    
    REFTABLE_REALLOC_ARRAY doesn't free origin pointer when reftable_realloc
    failed. This leak can be fixed by add a free(x) before set x to NULL.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1955%2Fbrandb97%2Ffix-REFTABLE-REALLOC-leak-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1955/brandb97/fix-REFTABLE-REALLOC-leak-v3
Pull-Request: https://github.com/git/git/pull/1955
Range-diff vs v2:
 1:  6cc191f9db8 ! 1:  107f9ce3bd0 REFTABLE_REALLOC_ARRAY: remove this unsafe yet unused macro
     @@ Commit message
      
       ## reftable/basics.h ##
      @@ reftable/basics.h: static inline int reftable_alloc_size(size_t nelem, size_t elsize, size_t *out)
     - 			(x) = reftable_malloc(alloc_size); \
       		} \
       	} while (0)
     --#define REFTABLE_CALLOC_ARRAY(x, alloc) (x) = reftable_calloc((alloc), sizeof(*(x)))
     + #define REFTABLE_CALLOC_ARRAY(x, alloc) (x) = reftable_calloc((alloc), sizeof(*(x)))
      -#define REFTABLE_REALLOC_ARRAY(x, alloc) do { \
      -		size_t alloc_size; \
      -		if (reftable_alloc_size(sizeof(*(x)), (alloc), &alloc_size) < 0) { \
     @@ reftable/basics.h: static inline int reftable_alloc_size(size_t nelem, size_t el
      -			(x) = reftable_realloc((x), alloc_size); \
      -		} \
      -	} while (0)
     -+#define REFTABLE_CALLOC_ARRAY(x, alloc) \
     -+	(x) = reftable_calloc((alloc), sizeof(*(x)))
       
       static inline void *reftable_alloc_grow(void *p, size_t nelem, size_t elsize,
       					size_t *allocp)
 reftable/basics.h | 9 ---------
 1 file changed, 9 deletions(-)
diff --git a/reftable/basics.h b/reftable/basics.h
index d8888c12629..1674a6f8b80 100644
--- a/reftable/basics.h
+++ b/reftable/basics.h
@@ -200,15 +200,6 @@ static inline int reftable_alloc_size(size_t nelem, size_t elsize, size_t *out)
 		} \
 	} while (0)
 #define REFTABLE_CALLOC_ARRAY(x, alloc) (x) = reftable_calloc((alloc), sizeof(*(x)))
-#define REFTABLE_REALLOC_ARRAY(x, alloc) do { \
-		size_t alloc_size; \
-		if (reftable_alloc_size(sizeof(*(x)), (alloc), &alloc_size) < 0) { \
-			errno = ENOMEM; \
-			(x) = NULL; \
-		} else { \
-			(x) = reftable_realloc((x), alloc_size); \
-		} \
-	} while (0)
 
 static inline void *reftable_alloc_grow(void *p, size_t nelem, size_t elsize,
 					size_t *allocp)

base-commit: 6f84262c44a89851c3ae5a6e4c1a9d06b2068d75
-- 
gitgitgadget
Previous: lidongyanNext: Patrick Steinhardt
Message 8 of 10 in “REFTABLE_REALLOC_ARRAY: fix potential memory leak if realloc failed”
  1. REFTABLE_REALLOC_ARRAY: fix potential memory leak if realloc failedLidong Yan via GitGitGadget, May 8, 2025
  2. René ScharfeMay 8, 2025
  3. lidongyanMay 9, 2025
  4. Junio C HamanoMay 9, 2025
  5. REFTABLE_REALLOC_ARRAY: remove this unsafe yet unused macroLidong Yan via GitGitGadget, May 9, 2025
  6. Patrick SteinhardtMay 9, 2025
  7. lidongyanMay 9, 2025
  8. REFTABLE_REALLOC_ARRAY: remove this unsafe yet unused macroLidong Yan via GitGitGadget, May 9, 2025
  9. Patrick SteinhardtMay 9, 2025
  10. Junio C HamanoMay 9, 2025

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.