[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[ggaren at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 6cca634726c966cc2abf10a47070999bef39c32b
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 9 04:32:59 2010 +0000

    Try to fix crash-on-launch seen on Windows builder.
    
    Reviewed by Sam Weinig.
    
    * wtf/OSAllocatorWin.cpp:
    (WTF::OSAllocator::release): Disabled an ASSERT, because it checks for
    a bug that hasn't been fixed yet.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73592 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index cf9a386..1cdc780 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,15 @@
 2010-12-08  Geoffrey Garen  <ggaren at apple.com>
 
+        Reviewed by Sam Weinig.
+
+        Try to fix crash-on-launch seen on Windows builder.
+
+        * wtf/OSAllocatorWin.cpp:
+        (WTF::OSAllocator::release): Disabled an ASSERT, because it checks for
+        a bug that hasn't been fixed yet.
+
+2010-12-08  Geoffrey Garen  <ggaren at apple.com>
+
         Try to fix Windows build.
 
         * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: Updated .def file.
diff --git a/JavaScriptCore/wtf/OSAllocatorWin.cpp b/JavaScriptCore/wtf/OSAllocatorWin.cpp
index fc62fb7..c0ea037 100644
--- a/JavaScriptCore/wtf/OSAllocatorWin.cpp
+++ b/JavaScriptCore/wtf/OSAllocatorWin.cpp
@@ -76,7 +76,10 @@ void OSAllocator::release(void* address, size_t bytes)
     // According to http://msdn.microsoft.com/en-us/library/aa366892(VS.85).aspx,
     // dwSize must be 0 if dwFreeType is MEM_RELEASE.
     bool result = VirtualFree(address, 0, MEM_RELEASE);
-    if (!result)
+
+    // FIXME: Restore this error checking once aligned allocation is fixed not
+    // to pair malloc with VirtualFree.
+    if (!result && 0)
         CRASH();
 }
 

-- 
WebKit Debian packaging