From da8d2fa7aab7a6a1ff816af734e05f7ca01eda3e Mon Sep 17 00:00:00 2001
From: Peter Limkilde Svendsen <peter.limkilde@gmail.com>
Date: Sun, 24 May 2020 18:29:57 +0200
Subject: [PATCH] Always set memptr in posix_memalign()

---
 src/header/stdlib/mod.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/header/stdlib/mod.rs b/src/header/stdlib/mod.rs
index e4d09cf6f3..22cdb5a117 100644
--- a/src/header/stdlib/mod.rs
+++ b/src/header/stdlib/mod.rs
@@ -647,13 +647,14 @@ pub unsafe extern "C" fn posix_memalign(
 
     if alignment % VOID_PTR_SIZE == 0 && alignment.is_power_of_two() {
         let ptr = platform::alloc_align(size, alignment);
-        if !ptr.is_null() {
-            *memptr = ptr;
-            0
-        } else {
+        *memptr = ptr;
+        if ptr.is_null() {
             ENOMEM
+        } else {
+            0
         }
     } else {
+        *memptr = ptr::null_mut();
         EINVAL
     }
 }