Bug#487745: epiphany-webkit: crashes on startup

[Mike Hommey]

On Wed, Jun 25, 2008 at 09:40:50AM +0200, Axel Beckert <[EMAIL PROTECTED]> 
wrote:
> Hi Mike,
> 
> On Wed, Jun 25, 2008 at 07:16:56AM +0200, Mike Hommey wrote:
> > Can you try again with this new patch (attached) ? (I just hope you
> > still have the build tree... then please use the -nc option to
> > dpkg-buildpackage, so that you don't waste another 4.5 hours)
> 
> Found no attachment. Can you send it again?

Oops, my bad, here it is.

> Still have the tree. Shall I then first unpatch the first patch?

Yes, both patches conflict with each other. Unapply the previous one
and apply the new one.

Thanks

Mike

diff --git a/JavaScriptCore/wtf/FastMalloc.cpp 
b/JavaScriptCore/wtf/FastMalloc.cpp
index 8afc70d..26ac1de 100644
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@ -1820,13 +1820,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 uint64_t pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(uint64_t) 
- 1) / sizeof(uint64_t)];
 static bool phinited = false;
 
 // Avoid extra level of indirection by making "pageheap" be just an alias
 // of pageheap_memory.
 typedef union {
-    void* m_memory;
+    uint64_t m_memory;
     TCMalloc_PageHeap* m_pageHeap;
 } PageHeapUnion;