aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-08-23 10:01:57 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-08-23 10:31:15 -0700
commit8d5e64e852eaaa0a486345aeceeeb64ba491b020 (patch)
treea93c5fe13c6427047ff1340f7ef29e12f4dc1ed8
parentb88b4adc2d20191fc53b7c4b89f88ed7f3d71b14 (diff)
do not fail when mmaping a MEMFS.CONTENT_FIXED
-rw-r--r--src/library_memfs.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library_memfs.js b/src/library_memfs.js
index 9f9f054e..63326c42 100644
--- a/src/library_memfs.js
+++ b/src/library_memfs.js
@@ -250,10 +250,10 @@ mergeInto(LibraryManager.library, {
var allocated;
var contents = stream.node.contents;
// Only make a new copy when MAP_PRIVATE is specified.
- if (!(flags & {{{ cDefine('MAP_PRIVATE') }}})) {
+ if ( !(flags & {{{ cDefine('MAP_PRIVATE') }}}) &&
+ (contents.buffer === buffer || contents.buffer === buffer.buffer) ) {
// We can't emulate MAP_SHARED when the file is not backed by the buffer
// we're mapping to (e.g. the HEAP buffer).
- assert(contents.buffer === buffer || contents.buffer === buffer.buffer);
allocated = false;
ptr = contents.byteOffset;
} else {