Merge branch 'master' into libcxx

1 files changed, 4 insertions, 1 deletions

diff --git a/src/library.js b/src/library.js
index 35466c10..5a429131 100644
--- a/src/library.js
+++ b/src/library.js
@@ -3184,7 +3184,9 @@ LibraryManager.library = {
      * mmap.
      */
     if (stream == -1) {
-      return allocate(num, 'i8', ALLOC_NORMAL);
+      var ptr = _malloc(num);
+      _memset(ptr, 0, num);
+      return ptr;
     }
     var info = FS.streams[stream];
     if (!info) return -1;
@@ -3195,6 +3197,7 @@ LibraryManager.library = {
 
   munmap: function(start, num) {
     _free(start);
+    return 0;
   },
 
   // TODO: Implement mremap.