From: "Lidong Yan via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "René Scharfe" <l.s.r@web.de>, "Patrick Steinhardt" <ps@pks.im>,
"Lidong Yan" <502024330056@smail.nju.edu.cn>,
"Lidong Yan" <502024330056@smail.nju.edu.cn>
Subject: [PATCH v3] REFTABLE_REALLOC_ARRAY: remove this unsafe yet unused macro
Date: Fri, 09 May 2025 07:44:46 +0000 [thread overview]
Message-ID: <pull.1955.v3.git.git.1746776686718.gitgitgadget@gmail.com> (raw)
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
next prev parent reply other threads:[~2025-05-09 7:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-08 13:39 [PATCH] REFTABLE_REALLOC_ARRAY: fix potential memory leak if realloc failed Lidong Yan via GitGitGadget
2025-05-08 21:42 ` René Scharfe
2025-05-09 1:54 ` lidongyan
2025-05-09 3:43 ` Junio C Hamano
2025-05-09 2:04 ` [PATCH v2] REFTABLE_REALLOC_ARRAY: remove this unsafe yet unused macro Lidong Yan via GitGitGadget
2025-05-09 6:51 ` Patrick Steinhardt
2025-05-09 7:38 ` lidongyan
2025-05-09 7:44 ` Lidong Yan via GitGitGadget [this message]
2025-05-09 8:23 ` [PATCH v3] " Patrick Steinhardt
2025-05-09 14:25 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1955.v3.git.git.1746776686718.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=502024330056@smail.nju.edu.cn \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.