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

morrita at google.com morrita at google.com
Wed Dec 22 16:32:02 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 3f29bf3cd0f04201f22b3e89687c6fb798239b8a
Author: morrita at google.com <morrita at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 25 07:08:32 2010 +0000

    2010-11-24  MORITA Hajime  <morrita at google.com>
    
            Reviewed by Kent Tamura.
    
            [Chromium][Windows] TestShell flakily crashes with EventSender.contextClick()
            https://bugs.webkit.org/show_bug.cgi?id=50052
    
            makeStringArrayImpl() assumed wtf::StringImpl data is
            null-terminated. But it is not.
            Changed the code to pass the string length explicitly instead of
            making it computed by v8::String::New().
    
            * src/WebBindings.cpp:
            (WebKit::makeStringArrayImpl):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72721 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a67481d..4ecd19a 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-24  MORITA Hajime  <morrita at google.com>
+
+        Reviewed by Kent Tamura.
+
+        [Chromium][Windows] TestShell flakily crashes with EventSender.contextClick()
+        https://bugs.webkit.org/show_bug.cgi?id=50052
+        
+        makeStringArrayImpl() assumed wtf::StringImpl data is
+        null-terminated. But it is not.
+        Changed the code to pass the string length explicitly instead of
+        making it computed by v8::String::New().
+
+        * src/WebBindings.cpp:
+        (WebKit::makeStringArrayImpl):
+
 2010-11-24  Eric Uhrhane  <ericu at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebKit/chromium/src/WebBindings.cpp b/WebKit/chromium/src/WebBindings.cpp
index d0a20d3..0882e38 100644
--- a/WebKit/chromium/src/WebBindings.cpp
+++ b/WebKit/chromium/src/WebBindings.cpp
@@ -328,7 +328,7 @@ static NPObject* makeStringArrayImpl(const WebVector<WebString>& data)
     v8::HandleScope handleScope;
     v8::Handle<v8::Array> result = v8::Array::New(data.size());
     for (size_t i = 0; i < data.size(); ++i)
-        result->Set(i, data[i].data() ? v8::String::New(reinterpret_cast<const uint16_t*>((data[i].data()))) : v8::String::New(""));
+        result->Set(i, data[i].data() ? v8::String::New(reinterpret_cast<const uint16_t*>((data[i].data())), data[i].length()) : v8::String::New(""));
 
     WebCore::DOMWindow* window = WebCore::V8Proxy::retrieveWindow(WebCore::V8Proxy::currentContext());
     return npCreateV8ScriptObject(0, result, window);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list