Title: [198823] trunk/Source/WebKit2
Revision
198823
Author
ddkil...@apple.com
Date
2016-03-29 19:50:12 -0700 (Tue, 29 Mar 2016)

Log Message

REGRESSION: Yosemite-only: com.apple.WebKit.Plugin.32.Development crashed in PluginProcessShim.dylib: WebKit::shimMachVMMap + 26
<http://webkit.org/b/156000>
<rdar://problem/25272133>

Reviewed by Joseph Pecoraro.

* PluginProcess/mac/PluginProcessShim.mm:
(WebKit::shimMachVMMap): Add SUPPRESS_ASAN attribute on
Yosemite.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (198822 => 198823)


--- trunk/Source/WebKit2/ChangeLog	2016-03-30 02:36:36 UTC (rev 198822)
+++ trunk/Source/WebKit2/ChangeLog	2016-03-30 02:50:12 UTC (rev 198823)
@@ -1,3 +1,15 @@
+2016-03-29  David Kilzer  <ddkil...@apple.com>
+
+        REGRESSION: Yosemite-only: com.apple.WebKit.Plugin.32.Development crashed in PluginProcessShim.dylib: WebKit::shimMachVMMap + 26
+        <http://webkit.org/b/156000>
+        <rdar://problem/25272133>
+
+        Reviewed by Joseph Pecoraro.
+
+        * PluginProcess/mac/PluginProcessShim.mm:
+        (WebKit::shimMachVMMap): Add SUPPRESS_ASAN attribute on
+        Yosemite.
+
 2016-03-28  Enrica Casucci  <enr...@apple.com>
 
         When moving focus from one select element to another (iPhone) the value is committed to the newly focused element.

Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm (198822 => 198823)


--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm	2016-03-30 02:36:36 UTC (rev 198822)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm	2016-03-30 02:50:12 UTC (rev 198823)
@@ -38,6 +38,7 @@
 #import <sys/ipc.h>
 #import <sys/mman.h>
 #import <sys/shm.h>
+#import <wtf/Compiler.h>
 #import <wtf/spi/darwin/SandboxSPI.h>
 
 namespace WebKit {
@@ -111,6 +112,9 @@
     return LSOpenCFURLRef(url, launchedURL);
 }
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
+SUPPRESS_ASAN
+#endif
 static kern_return_t shimMachVMMap(vm_map_t task, mach_vm_address_t *address, mach_vm_size_t size, mach_vm_offset_t mask, int flags, mem_entry_name_port_t object, memory_object_offset_t offset, boolean_t copy, vm_prot_t currentProtection, vm_prot_t maxProtection, vm_inherit_t inheritance)
 {
     if (task == mach_task_self()) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to