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

[rniwa at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e4ae8c74c769787d46f51525308473417b8d5fd4
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 16 23:12:51 2010 +0000

    2010-12-16  Ryosuke Niwa  <rniwa at webkit.org>
    
            Reviewed by Cameron Zwarich.
    
            REGRESSION(r74172): 125 java tests fail on Mac
            https://bugs.webkit.org/show_bug.cgi?id=51214
    
            The regression was caused by an incorrectly adding sizeof(struct fat_header)
            to a pointer for uint32_t as supposed to uint8_t.
    
            Fixed the bug by explicitly casting it to uint8_t* before the addition.
    
            * Plugins/WebBasePluginPackage.mm:
            (-[WebBasePluginPackage isNativeLibraryData:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74216 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index dfdff5f..575e7ac 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-16  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Reviewed by Cameron Zwarich.
+
+        REGRESSION(r74172): 125 java tests fail on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=51214
+
+        The regression was caused by an incorrectly adding sizeof(struct fat_header)
+        to a pointer for uint32_t as supposed to uint8_t.
+
+        Fixed the bug by explicitly casting it to uint8_t* before the addition.
+
+        * Plugins/WebBasePluginPackage.mm:
+        (-[WebBasePluginPackage isNativeLibraryData:]):
+
 2010-12-15  Cameron Zwarich  <zwarich at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/mac/Plugins/WebBasePluginPackage.mm b/WebKit/mac/Plugins/WebBasePluginPackage.mm
index 08c3e60..1ff5516 100644
--- a/WebKit/mac/Plugins/WebBasePluginPackage.mm
+++ b/WebKit/mac/Plugins/WebBasePluginPackage.mm
@@ -395,7 +395,7 @@ static inline void swapIntsInHeader(uint32_t* rawData, size_t length)
             if (magic == FAT_CIGAM)
                 swapIntsInHeader(rawData.data(), rawData.size());
             
-            archs = (struct fat_arch*)(rawData.data() + sizeof(struct fat_header));            
+            archs = (struct fat_arch*)((uint8_t*)rawData.data() + sizeof(struct fat_header));            
             numArchs = ((struct fat_header *)rawData.data())->nfat_arch;
             
             unsigned maxArchs = (sizeInBytes - sizeof(struct fat_header)) / sizeof(struct fat_arch);

-- 
WebKit Debian packaging