diff options
author | Alon Zakai <alonzakai@gmail.com> | 2011-12-16 17:46:05 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2011-12-16 17:46:05 -0800 |
commit | ef3d0541e91af4b7279bd8e30b112b1a3a108f9e (patch) | |
tree | 0a47cfd57be19b093e06f92e7f15186f9dbad9c5 /src/library.js | |
parent | 086526150c8dc53800a63af9571c62410a161cc6 (diff) |
fix bug with accessing memory beyond TOTAL_MEMORY through sbrk
Diffstat (limited to 'src/library.js')
-rw-r--r-- | src/library.js | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/library.js b/src/library.js index 2a4a5e7d..ba9ef0f8 100644 --- a/src/library.js +++ b/src/library.js @@ -2111,15 +2111,12 @@ LibraryManager.library = { // TODO: We could in theory slice off the top of the HEAP when // sbrk gets a negative increment in |bytes|... var self = _sbrk; - if (!self.STATICTOP) { - STATICTOP = alignMemoryPage(STATICTOP); - self.STATICTOP = STATICTOP; - self.DATASIZE = 0; - } else { - assert(self.STATICTOP == STATICTOP, "No one should touch the heap!"); + if (!self.called) { + STATICTOP = alignMemoryPage(STATICTOP); // make sure we start out aligned + self.called = true; } - var ret = STATICTOP + self.DATASIZE; - self.DATASIZE += alignMemoryPage(bytes); + var ret = STATICTOP; + if (bytes != 0) Runtime.staticAlloc(bytes); return ret; // Previous break location. }, open64: 'open', |