DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libubox: Change calloc_a() to return size_t aligned pointers

Browse source 
Un-aligned pointers were causing seg faults on some targets

Signed-off-by: Ted Hess <thess@kitschensync.net>
This commit is contained in:
Ted Hess 2017-02-23 15:57:02 -05:00
parent de3f14b643
commit 96305a3caf
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
utils.c
View file

@ -27,6 +27,9 @@
_addr; \ _addr; \
_addr = va_arg(_arg, void **), _len = _addr ? va_arg(_arg, size_t) : 0) _addr = va_arg(_arg, void **), _len = _addr ? va_arg(_arg, size_t) : 0)
#define C_PTR_ALIGN (sizeof(size_t))
#define C_PTR_MASK (-C_PTR_ALIGN)
void *__calloc_a(size_t len, ...) void *__calloc_a(size_t len, ...)
{ {
va_list ap, ap1; va_list ap, ap1;
@ -40,7 +43,7 @@ void *__calloc_a(size_t len, ...)
va_copy(ap1, ap); va_copy(ap1, ap);
foreach_arg(ap1, cur_addr, cur_len, &ret, len) foreach_arg(ap1, cur_addr, cur_len, &ret, len)
alloc_len += cur_len; alloc_len += (cur_len + C_PTR_ALIGN - 1 ) & C_PTR_MASK;
va_end(ap1); va_end(ap1);
ptr = calloc(1, alloc_len); ptr = calloc(1, alloc_len);
@ -49,7 +52,7 @@ void *__calloc_a(size_t len, ...)
alloc_len = 0; alloc_len = 0;
foreach_arg(ap, cur_addr, cur_len, &ret, len) { foreach_arg(ap, cur_addr, cur_len, &ret, len) {
*cur_addr = &ptr[alloc_len]; *cur_addr = &ptr[alloc_len];
alloc_len += cur_len; alloc_len += (cur_len + C_PTR_ALIGN - 1) & C_PTR_MASK;
} }
va_end(ap); va_end(ap);