From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "René Scharfe" <l.s.r@web.de>
Cc: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] compat: let git_mmap use malloc(3) directly
Date: Mon, 23 Aug 2021 22:27:45 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2108232227140.55@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <9c2fe5de-be23-3e66-6edf-3c2edfb804f3@web.de>
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
Hi René,
On Sat, 21 Aug 2021, René Scharfe wrote:
> xmalloc() dies on error, allows zero-sized allocations and enforces
> GIT_ALLOC_LIMIT for testing. Our mmap replacement doesn't need any of
> that. Let's cut out the wrapper, reject zero-sized requests as required
> by POSIX and use malloc(3) directly. Allocation errors were needlessly
> handled by git_mmap() before; this code becomes reachable now.
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Thanks!
Dscho
>
> Signed-off-by: René Scharfe <l.s.r@web.de>
> ---
> compat/mmap.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/compat/mmap.c b/compat/mmap.c
> index 14d31010df..8d6c02d4bc 100644
> --- a/compat/mmap.c
> +++ b/compat/mmap.c
> @@ -7,7 +7,12 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of
> if (start != NULL || flags != MAP_PRIVATE || prot != PROT_READ)
> die("Invalid usage of mmap when built with NO_MMAP");
>
> - start = xmalloc(length);
> + if (length == 0) {
> + errno = EINVAL;
> + return MAP_FAILED;
> + }
> +
> + start = malloc(length);
> if (start == NULL) {
> errno = ENOMEM;
> return MAP_FAILED;
> --
> 2.33.0
>
prev parent reply other threads:[~2021-08-23 20:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-21 12:52 [PATCH] compat: let git_mmap use malloc(3) directly René Scharfe
2021-08-23 16:15 ` Jeff King
2021-08-23 20:27 ` Johannes Schindelin [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2108232227140.55@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).