From: Corinna Vinschen <vinschen@redhat.com>
To: newlib@sourceware.org
Subject: Re: [PATCH] libc/stdlib: Fix build failure in nano_calloc
Date: Thu, 13 Aug 2020 10:01:12 +0200 [thread overview]
Message-ID: <20200813080112.GT53219@calimero.vinschen.de> (raw)
In-Reply-To: <ff71969c-9fe7-0d3a-a76d-7ef8969156a2@embecosm.com>
On Aug 12 15:33, Craig Blackmore wrote:
> commit 588a5e1ddebdf6d74391c7409680ea20e050c0e1 added a non-reentrant
> call to nano_malloc which causes a build failure if INTERNAL_NEWLIB is
> defined.
>
> Here is a snippet of the error:
>
> In file included from .../newlib/newlib/libc/stdlib/nano-mallocr.c:38:
> .../newlib/newlib/libc/include/malloc.h:42:25: note: expected 'struct _reent *' but argument is of type 'ptrdiff_t' {aka 'int'}
> 42 | extern void *_malloc_r (struct _reent *, size_t);
> | ^~~~~~~~~~~~~~~
> .../newlib/newlib/libc/stdlib/nano-mallocr.c:67:22: error: too few arguments to function '_malloc_r'
> 67 | #define nano_malloc _malloc_r
> | ^~~~~~~~~
> .../newlib/newlib/libc/stdlib/nano-mallocr.c:456:11: note: in expansion of macro 'nano_malloc'
> 456 | mem = nano_malloc(bytes);
> | ^~~~~~~~~~~
> In file included from .../newlib/newlib/libc/stdlib/nano-mallocr.c:38:
> .../newlib/newlib/libc/include/malloc.h:42:14: note: declared here
> 42 | extern void *_malloc_r (struct _reent *, size_t);
> | ^~~~~~~~~
> .../newlib/newlib/libc/stdlib/nano-mallocr.c:43: warning: "assert" redefined
> 43 | #define assert(x) ((void)0)
> |
>
> This patch adds a missing RCALL to the args when calling nano_malloc
> from nano_calloc, so that if the call is reentrant, reent_ptr is passed
> as the first argument.
>
> The variable `bytes` (also added in 588a5e1d) has been changed from a
> `ptrdiff_t` to `malloc_size_t` as it does not need to be signed. It is
> used to store the product of two unsigned malloc_size_t variables and
> then iff there was no overflow is it passed to malloc and memset which
> both expect size_t which is unsigned.
>
> Signed-off-by: Craig Blackmore <craig.blackmore@embecosm.com>
> ---
> newlib/libc/stdlib/nano-mallocr.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Pushed.
Thanks,
Corinna
--
Corinna Vinschen
Cygwin Maintainer
Red Hat
next prev parent reply other threads:[~2020-08-13 8:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-12 14:33 Craig Blackmore
2020-08-13 8:01 ` Corinna Vinschen [this message]
2020-08-13 8:05 ` Claudio
2020-08-13 8:18 ` Corinna Vinschen
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=20200813080112.GT53219@calimero.vinschen.de \
--to=vinschen@redhat.com \
--cc=newlib@sourceware.org \
/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 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).