Changeset 3722 for branches/libc-0.6/src

Timestamp:

Mar 17, 2011, 10:33:44 PM (14 years ago)

Author:

bird

Message:

0.6: Backported r3721: posix_memalign.c: Always set errno. References #223.

File:

• branches/libc-0.6/src/emx/src/lib/malloc/posix_memalign.c (modified) (4 diffs)

branches/libc-0.6/src/emx/src/lib/malloc/posix_memalign.c

@@ -31 +31 @@
 #include <stdlib.h>
 #include <stddef.h>
+#include <errno.h>
 #include <umalloc.h>
 #include <emx/umalloc.h>
@@ -59 +60 @@
      */
     *memptr = NULL;                     /* touch it so we crash here. */
-    /** @todo verify that alignment is a power of 2 */
+    if (   (alignment & (alignment - 1)) != 0
+        || alignment < sizeof(void *))
+    {
+        errno = EINVAL;
+        LIBCLOG_ERROR_RETURN_INT(-1);
+    }
 
     /*
@@ -69 +75 @@
     assert(Heap->magic == _UM_MAGIC_HEAP);
     if (Heap->magic != _UM_MAGIC_HEAP)
+    {
+        errno = EDOOFUS;
         LIBCLOG_ERROR_RETURN_INT(-1);
+    }
 
     /*
@@ -87 +96 @@
     if (pv)
         LIBCLOG_RETURN_INT(0);
+    errno = ENOMEM;
     LIBCLOG_ERROR_RETURN_INT(-1);
 }