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

rniwa at webkit.org rniwa at webkit.org
Wed Dec 22 15:36:21 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 92bd01b36a36663852cdfe369364e287e574ea2e
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 03:19:55 2010 +0000

    2010-11-08  Ryosuke Niwa  <rniwa at webkit.org>
    
            Unreviewed build fix for Chromium Mac for r71590.
    
            * platform/graphics/mac/ComplexTextControllerCoreText.cpp:
            (WebCore::provideStringAndAttributes):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71598 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c3cb8a8..81d70fd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-08  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Unreviewed build fix for Chromium Mac for r71590.
+
+        * platform/graphics/mac/ComplexTextControllerCoreText.cpp:
+        (WebCore::provideStringAndAttributes):
+
 2010-11-08  Anton Muhin  <antonm at chromium.org>
 
         Reviewed by Nate Chapin.
diff --git a/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp b/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp
index 0346d56..cbb7610 100644
--- a/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp
+++ b/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp
@@ -111,7 +111,7 @@ struct ProviderInfo {
 static const UniChar* provideStringAndAttributes(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void* refCon)
 {
     ProviderInfo* info = static_cast<struct ProviderInfo*>(refCon);
-    if (stringIndex >= info->length)
+    if (stringIndex < 0 || static_cast<unsigned>(stringIndex) >= info->length)
         return 0;
 
     *charCount = info->length - stringIndex;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list