Title: [184492] branches/safari-601.1.32.2-branch/Source/WTF
- Revision
- 184492
- Author
- [email protected]
- Date
- 2015-05-18 10:00:24 -0700 (Mon, 18 May 2015)
Log Message
Merge r184245. rdar://problem/19611967
Modified Paths
Diff
Modified: branches/safari-601.1.32.2-branch/Source/WTF/ChangeLog (184491 => 184492)
--- branches/safari-601.1.32.2-branch/Source/WTF/ChangeLog 2015-05-18 17:00:19 UTC (rev 184491)
+++ branches/safari-601.1.32.2-branch/Source/WTF/ChangeLog 2015-05-18 17:00:24 UTC (rev 184492)
@@ -1,3 +1,19 @@
+2015-05-18 Matthew Hanson <[email protected]>
+
+ Merge r184245. rdar://problem/19611967
+
+ 2015-05-12 Michael Saboff <[email protected]>
+
+ If JSC cannot get executable memory, it shouldn't call madvise
+ https://bugs.webkit.org/show_bug.cgi?id=144931
+
+ Reviewed by Mark Lam.
+
+ Made calling madvise conditional on really getting mmapped memory.
+
+ * wtf/OSAllocatorPosix.cpp:
+ (WTF::OSAllocator::reserveUncommitted):
+
2015-05-12 Dana Burkart <[email protected]>
Merge r184137. rdar://problem/20707307
Modified: branches/safari-601.1.32.2-branch/Source/WTF/wtf/OSAllocatorPosix.cpp (184491 => 184492)
--- branches/safari-601.1.32.2-branch/Source/WTF/wtf/OSAllocatorPosix.cpp 2015-05-18 17:00:19 UTC (rev 184491)
+++ branches/safari-601.1.32.2-branch/Source/WTF/wtf/OSAllocatorPosix.cpp 2015-05-18 17:00:24 UTC (rev 184492)
@@ -50,8 +50,10 @@
#else
void* result = reserveAndCommit(bytes, usage, writable, executable, includesGuardPages);
#if HAVE(MADV_FREE_REUSE)
- // To support the "reserve then commit" model, we have to initially decommit.
- while (madvise(result, bytes, MADV_FREE_REUSABLE) == -1 && errno == EAGAIN) { }
+ if (result) {
+ // To support the "reserve then commit" model, we have to initially decommit.
+ while (madvise(result, bytes, MADV_FREE_REUSABLE) == -1 && errno == EAGAIN) { }
+ }
#endif
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
