JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libc/stdlib: Fix build failure in nano_calloc

Browse Source 
commit 588a5e1dde 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>
This commit is contained in:
Craig Blackmore 2020-08-12 15:33:23 +01:00 committed by Corinna Vinschen
parent 588a5e1dde
commit ab215e3dd1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
newlib/libc/stdlib/nano-mallocr.c
View File

@ -445,7 +445,7 @@ void nano_cfree(RARG void * ptr)
* Implement calloc simply by calling malloc and set zero */ * Implement calloc simply by calling malloc and set zero */
void * nano_calloc(RARG malloc_size_t n, malloc_size_t elem) void * nano_calloc(RARG malloc_size_t n, malloc_size_t elem)
{ {
ptrdiff_t bytes; malloc_size_t bytes;
void * mem; void * mem;
if (__builtin_mul_overflow (n, elem, &bytes)) if (__builtin_mul_overflow (n, elem, &bytes))
@ -453,7 +453,7 @@ void * nano_calloc(RARG malloc_size_t n, malloc_size_t elem)
RERRNO = ENOMEM; RERRNO = ENOMEM;
return NULL; return NULL;
} }
mem = nano_malloc(bytes); mem = nano_malloc(RCALL bytes);
if (mem != NULL) memset(mem, 0, bytes); if (mem != NULL) memset(mem, 0, bytes);
return mem; return mem;
} }