Bug#487745: epiphany-webkit: crashes on startup

[Mike Hommey]

On Mon, Jun 23, 2008 at 11:00:38PM +0200, Axel Beckert wrote:
> Package: epiphany-webkit
> Version: 2.22.1.1-1
> Severity: grave
> 
> When I try to start epiphany-webkit (first use, no stored session or
> requested a new one), it crashes with SIGBUS. epiphany-gecko works
> fine, though.

Could you try to rebuild webkit with the attached patch applied, and
test if that works better ?

Mike
-------------- next part --------------
diff --git a/JavaScriptCore/wtf/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp
index ffcc6ad..585cebb 100644
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@ -1877,23 +1877,13 @@ static TCMalloc_Central_FreeListPadded central_cache[kNumClasses];
 
 // Page-level allocator
 static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
-static void* pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(void*) - 1) / sizeof(void*)];
+static TCMalloc_PageHeap pageheap_memory;
 static bool phinited = false;
 
 // Avoid extra level of indirection by making "pageheap" be just an alias
 // of pageheap_memory.
-typedef union {
-    void* m_memory;
-    TCMalloc_PageHeap* m_pageHeap;
-} PageHeapUnion;
-
-static inline TCMalloc_PageHeap* getPageHeap()
-{
-    PageHeapUnion u = { &pageheap_memory[0] };
-    return u.m_pageHeap;
-}
 
-#define pageheap getPageHeap()
+static TCMalloc_PageHeap *pageheap = &pageheap_memory;
 
 // If TLS is available, we also store a copy
 // of the per-thread object in a __thread variable