[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

[cwzwarich at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit ac37ab640d95d295d4527af56634740d4df3a24e
Author: cwzwarich at webkit.org <cwzwarich at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 22 02:16:06 2010 +0000

    Reviewed by Darin Adler.
    
    -[WebBasePluginPackage isNativeLibraryData:] integer underflows on zero-sized data
    https://bugs.webkit.org/show_bug.cgi?id=51431
    <rdar://problem/8791757>
    
    * Plugins/WebBasePluginPackage.mm:
    (-[WebBasePluginPackage isNativeLibraryData:]): Change an arithmetic expression so
    it doesn't underflow.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74446 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 575e7ac..3b1fef6 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-21  Cameron Zwarich  <zwarich at apple.com>
+
+        Reviewed by Darin Adler.
+
+        -[WebBasePluginPackage isNativeLibraryData:] integer underflows on zero-sized data
+        https://bugs.webkit.org/show_bug.cgi?id=51431
+        <rdar://problem/8791757>
+
+        * Plugins/WebBasePluginPackage.mm:
+        (-[WebBasePluginPackage isNativeLibraryData:]): Change an arithmetic expression so
+        it doesn't underflow.
+
 2010-12-16  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Cameron Zwarich.
diff --git a/WebKit/mac/Plugins/WebBasePluginPackage.mm b/WebKit/mac/Plugins/WebBasePluginPackage.mm
index 1ff5516..05b084a 100644
--- a/WebKit/mac/Plugins/WebBasePluginPackage.mm
+++ b/WebKit/mac/Plugins/WebBasePluginPackage.mm
@@ -352,7 +352,7 @@ static inline void swapIntsInHeader(uint32_t* rawData, size_t length)
 - (BOOL)isNativeLibraryData:(NSData *)data
 {
     NSUInteger sizeInBytes = [data length];
-    Vector<uint32_t, 128> rawData((sizeInBytes - 1) / 4 + 1);
+    Vector<uint32_t, 128> rawData((sizeInBytes + 3) / 4);
     memcpy(rawData.data(), [data bytes], sizeInBytes);
     
     unsigned numArchs = 0;

-- 
WebKit Debian packaging