Title: [184245] trunk/Source/WTF
Revision
184245
Author
[email protected]
Date
2015-05-12 21:02:09 -0700 (Tue, 12 May 2015)

Log Message

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):

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (184244 => 184245)


--- trunk/Source/WTF/ChangeLog	2015-05-13 03:58:20 UTC (rev 184244)
+++ trunk/Source/WTF/ChangeLog	2015-05-13 04:02:09 UTC (rev 184245)
@@ -1,3 +1,15 @@
+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-11  Brent Fulgham  <[email protected]>
 
         [Win] Move Windows build target to Windows 7 (or newer)

Modified: trunk/Source/WTF/wtf/OSAllocatorPosix.cpp (184244 => 184245)


--- trunk/Source/WTF/wtf/OSAllocatorPosix.cpp	2015-05-13 03:58:20 UTC (rev 184244)
+++ trunk/Source/WTF/wtf/OSAllocatorPosix.cpp	2015-05-13 04:02:09 UTC (rev 184245)
@@ -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

Reply via email to