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

loki at webkit.org loki at webkit.org
Wed Dec 22 11:59:59 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 8839eef688b2144102c894ee7bece4081c48bca8
Author: loki at webkit.org <loki at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 12 18:22:34 2010 +0000

    2010-08-12  Gabor Loki  <loki at webkit.org>
    
            Reviewed by Geoffrey Garen.
    
            Fix the array subscript is above array bounds warning in ByteArray on ARM.
            https://bugs.webkit.org/show_bug.cgi?id=43358
    
            The warning is very similar to this one: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37861
    
            * wtf/ByteArray.cpp:
            (WTF::ByteArray::create):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65260 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 135bfc7..49a3e8c 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-12  Gabor Loki  <loki at webkit.org>
+
+        Reviewed by Geoffrey Garen.
+
+        Fix the array subscript is above array bounds warning in ByteArray on ARM.
+        https://bugs.webkit.org/show_bug.cgi?id=43358
+
+        The warning is very similar to this one: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37861
+
+        * wtf/ByteArray.cpp:
+        (WTF::ByteArray::create):
+
 2010-08-12  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Martin Robinson.
diff --git a/JavaScriptCore/wtf/ByteArray.cpp b/JavaScriptCore/wtf/ByteArray.cpp
index 526f147..910af59 100644
--- a/JavaScriptCore/wtf/ByteArray.cpp
+++ b/JavaScriptCore/wtf/ByteArray.cpp
@@ -25,12 +25,13 @@
 
 #include "config.h"
 #include "ByteArray.h"
+#include "StdLibExtras.h"
 
 namespace WTF {
 
 PassRefPtr<ByteArray> ByteArray::create(size_t size)
 {
-    unsigned char* buffer = new unsigned char[size + sizeof(ByteArray) - sizeof(size_t)];
+    unsigned char* buffer = new unsigned char[size + OBJECT_OFFSETOF(ByteArray, m_data)];
     ASSERT((reinterpret_cast<size_t>(buffer) & 3) == 0);
     return adoptRef(new (buffer) ByteArray(size));
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list