[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[barraclough at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit dc9d96ff8df5e7648048043490883c392e8362c3
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 21:16:06 2010 +0000

    Bug 36052 - [Qt] REGRESSION(55878) 63 test cases crash
    
    Reviewed by Geoff Garen.
    
    r55878 changed UStringImpl::empty()->characters() to be non-null,
    so TextBreakIteratorQt.cpp now should check the length of strings
    (previously was assuming all strings with a non-null data pointer
    had a length of at least 1).
    
    * platform/text/qt/TextBreakIteratorQt.cpp:
    (WebCore::wordBreakIterator):
    (WebCore::characterBreakIterator):
    (WebCore::lineBreakIterator):
    (WebCore::sentenceBreakIterator):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55934 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 351bf48..b9dc7a7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-03-12  Gavin Barraclough  <barraclough at apple.com>
+
+        Reviewed by Geoff Garen.
+
+        Bug 36052 - [Qt] REGRESSION(55878) 63 test cases crash
+
+        r55878 changed UStringImpl::empty()->characters() to be non-null,
+        so TextBreakIteratorQt.cpp now should check the length of strings
+        (previously was assuming all strings with a non-null data pointer
+        had a length of at least 1).
+
+        * platform/text/qt/TextBreakIteratorQt.cpp:
+        (WebCore::wordBreakIterator):
+        (WebCore::characterBreakIterator):
+        (WebCore::lineBreakIterator):
+        (WebCore::sentenceBreakIterator):
+
 2010-03-12  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/platform/text/qt/TextBreakIteratorQt.cpp b/WebCore/platform/text/qt/TextBreakIteratorQt.cpp
index 101947c..5a8a812 100644
--- a/WebCore/platform/text/qt/TextBreakIteratorQt.cpp
+++ b/WebCore/platform/text/qt/TextBreakIteratorQt.cpp
@@ -40,7 +40,7 @@ namespace WebCore {
 
     TextBreakIterator* wordBreakIterator(const UChar* string, int length)
     {
-        if (!string)
+        if (!string || !length)
             return 0;
         if (!iterator)
             iterator = new QTextBoundaryFinder;
@@ -51,7 +51,7 @@ namespace WebCore {
 
     TextBreakIterator* characterBreakIterator(const UChar* string, int length)
     {
-        if (!string)
+        if (!string || !length)
             return 0;
         if (!iterator)
             iterator = new QTextBoundaryFinder;
@@ -68,7 +68,7 @@ namespace WebCore {
     TextBreakIterator* lineBreakIterator(const UChar* string, int length)
     {
         static QTextBoundaryFinder *iterator = 0;
-        if (!string)
+        if (!string || !length)
             return 0;
         if (!iterator)
             iterator = new QTextBoundaryFinder;
@@ -79,7 +79,7 @@ namespace WebCore {
 
     TextBreakIterator* sentenceBreakIterator(const UChar* string, int length)
     {
-        if (!string)
+        if (!string || !length)
             return 0;
         if (!iterator)
             iterator = new QTextBoundaryFinder;

-- 
WebKit Debian packaging