From cdf3a2c3e029df373d64c926654e22e3dbd76d53 Mon Sep 17 00:00:00 2001
From: "Tate, Hongliang Tian" <tatetian@gmail.com>
Date: Mon, 7 Jan 2019 20:25:26 +0800
Subject: [PATCH] Small fix to malloc test

---
 src/libos/src/vm/process_vm.rs | 5 +++--
 test/malloc/main.c             | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libos/src/vm/process_vm.rs b/src/libos/src/vm/process_vm.rs
index 5401baec..f95b8744 100644
--- a/src/libos/src/vm/process_vm.rs
+++ b/src/libos/src/vm/process_vm.rs
@@ -52,7 +52,7 @@ impl ProcessVM {
         // No mmapped vmas initially
         let mmap_vmas = Vec::new();
 
-        Ok(ProcessVM {
+        let vm = ProcessVM {
             data_domain,
             code_vma,
             data_vma,
@@ -60,7 +60,8 @@ impl ProcessVM {
             stack_vma,
             mmap_vmas,
             brk,
-        })
+        };
+        Ok(vm)
     }
 
     fn alloc_vmas(data_domain: &mut VMDomain,
diff --git a/test/malloc/main.c b/test/malloc/main.c
index b291cfea..93188911 100644
--- a/test/malloc/main.c
+++ b/test/malloc/main.c
@@ -9,11 +9,10 @@ int main(void) {
     for (size_t buf_size = MIN_SIZE; buf_size <= MAX_SIZE; buf_size *= 4) {
         printf("buf_size = %lu\n", buf_size);
         void* buf = malloc(buf_size);
-        /* FIXME: why the first call to malloc always fail?
         if (buf == NULL) {
             printf("ERROR: failed to malloc for a buffer of %lu size\n", buf_size);
+            return -1;
         }
-        */
         free(buf);
     }
     printf("Done.\n");