[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.20-1-205-g409afb0

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit 409afb05b346282d451f678f5a0b15672afaa61d
Merge: 5f6bf91e591fd4425a49ff639c3aeab0119628fe 221d8e8ffb08b62c874166c554269eb8d8f44909
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Wed Feb 10 20:20:37 2010 -0200

    Merge branch 'webkit-1.1' into debian/unstable
    
    Conflicts:
    	WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
    	WebCore/platform/gtk/GOwnPtrGtk.cpp
    	WebCore/platform/network/soup/DNSSoup.cpp

diff --combined JavaScriptCore/wtf/FastMalloc.cpp
index 63a3191,79d2bfb..76e680f
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@@ -239,8 -239,16 +239,16 @@@ void* fastMalloc(size_t n
      void* result = malloc(n);
  #endif
  
-     if (!result)
+     if (!result) {
+ #if PLATFORM(BREWMP)
+         // The behavior of malloc(0) is implementation defined.
+         // To make sure that fastMalloc never returns 0, retry with fastMalloc(1).
+         if (!n)
+             return fastMalloc(1);
+ #endif
          CRASH();
+     }
+ 
      return result;
  }
  
@@@ -279,8 -287,16 +287,16 @@@ void* fastCalloc(size_t n_elements, siz
      void* result = calloc(n_elements, element_size);
  #endif
  
-     if (!result)
+     if (!result) {
+ #if PLATFORM(BREWMP)
+         // If either n_elements or element_size is 0, the behavior of calloc is implementation defined.
+         // To make sure that fastCalloc never returns 0, retry with fastCalloc(1, 1).
+         if (!n_elements || !element_size)
+             return fastCalloc(1, 1);
+ #endif
          CRASH();
+     }
+ 
      return result;
  }
  
@@@ -2312,13 -2328,13 +2328,13 @@@ static TCMalloc_Central_FreeListPadded 
  
  // 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;
  

-- 
WebKit Debian packaging