Changeset 184245 in webkit

Timestamp:

May 12, 2015, 9:02:09 PM (10 years ago)

Author:

msaboff@apple.com

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

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/OSAllocatorPosix.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2015-05-12  Michael Saboff  <msaboff@apple.com>
+
+        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  <bfulgham@apple.com>
 

trunk/Source/WTF/wtf/OSAllocatorPosix.cpp

@@ -51 +51 @@
     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