X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=utils.c;h=c22250d27ec78265b6a5ece8497b26f907cabff1;hp=e59002ed3062da8a210324d9d1baf9aabb81fdfc;hb=HEAD;hpb=0fe13749d095ca22c788e55902979323e85367c3

diff --git a/utils.c b/utils.c
index e59002e..c22250d 100644
--- a/utils.c
+++ b/utils.c
@@ -27,6 +27,9 @@
 		_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;
@@ -40,23 +43,26 @@ void *__calloc_a(size_t len, ...)
 
 	va_copy(ap1, ap);
 	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);
 
 	ptr = calloc(1, alloc_len);
-	if (!ptr)
+	if (!ptr) {
+		va_end(ap);
 		return NULL;
+	}
+
 	alloc_len = 0;
 	foreach_arg(ap, cur_addr, cur_len, &ret, len) {
 		*cur_addr = &ptr[alloc_len];
-		alloc_len += cur_len;
+		alloc_len += (cur_len + C_PTR_ALIGN - 1) & C_PTR_MASK;
 	}
 	va_end(ap);
 
 	return ret;
 }
 
-#ifdef __APPLE__
+#ifdef LIBUBOX_COMPAT_CLOCK_GETTIME
 #include <mach/mach_host.h>		/* host_get_clock_service() */
 #include <mach/mach_port.h>		/* mach_port_deallocate() */
 #include <mach/mach_init.h>		/* mach_host_self(), mach_task_self() */