Un-aligned pointers were causing seg faults on some targets
Signed-off-by: Ted Hess <thess@kitschensync.net>
_addr; \
_addr = va_arg(_arg, void **), _len = _addr ? va_arg(_arg, size_t) : 0)
_addr; \
_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, ...)
{
va_list ap, ap1;
void *__calloc_a(size_t len, ...)
{
va_list ap, ap1;
va_copy(ap1, ap);
foreach_arg(ap1, cur_addr, cur_len, &ret, len)
va_copy(ap1, ap);
foreach_arg(ap1, cur_addr, cur_len, &ret, len)
+ alloc_len += (cur_len + C_PTR_ALIGN - 1 ) & C_PTR_MASK;
va_end(ap1);
ptr = calloc(1, alloc_len);
va_end(ap1);
ptr = calloc(1, alloc_len);
alloc_len = 0;
foreach_arg(ap, cur_addr, cur_len, &ret, len) {
*cur_addr = &ptr[alloc_len];
alloc_len = 0;
foreach_arg(ap, cur_addr, cur_len, &ret, len) {
*cur_addr = &ptr[alloc_len];
+ alloc_len += (cur_len + C_PTR_ALIGN - 1) & C_PTR_MASK;