From 491e46858b3a6062fc49acbb4763e8adb34c5c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 16 Aug 2007 10:49:19 +0000 Subject: [PATCH] Shouldn't code before breakfast: * check against sizeof(void*)-1 instead of hardcoded 3. * return B_NO_MEMORY instead of NULL if the allocation failed... Thanks to Marcus and Ingo for proofreading :-) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21976 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/libroot/posix/malloc/wrapper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/system/libroot/posix/malloc/wrapper.cpp b/src/system/libroot/posix/malloc/wrapper.cpp index a926e1f563..e7dc6222bd 100644 --- a/src/system/libroot/posix/malloc/wrapper.cpp +++ b/src/system/libroot/posix/malloc/wrapper.cpp @@ -278,14 +278,14 @@ memalign(size_t alignment, size_t size) extern "C" int posix_memalign(void **_pointer, size_t alignment, size_t size) { - if ((alignment & 3) != 0 || _pointer == NULL) + if ((alignment & (sizeof(void *) - 1)) != 0 || _pointer == NULL) return B_BAD_VALUE; static processHeap *pHeap = getAllocator(); void *pointer = pHeap->getHeap(pHeap->getHeapIndex()).memalign(alignment, size); if (pointer == NULL) - return NULL; + return B_NO_MEMORY; #if HEAP_LEAK_CHECK add_address(pointer, size);