[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit efebbddb20c9e31a3a169f5a44e3a23c84b807aa
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 2 22:25:31 2003 +0000

    	Fix for 3493697, nil-deref in bidi code.  Need to null-check strings with no length.
    
            Reviewed by john
    
            * khtml/rendering/bidi.cpp:
            (khtml::addRun):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5653 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9f77964..31e3155 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2003-12-02  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3493697, nil-deref in bidi code.  Need to null-check strings with no length.
+	
+        Reviewed by john
+
+        * khtml/rendering/bidi.cpp:
+        (khtml::addRun):
+
+2003-12-02  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3495746, nil deref of containing block (frame inside frameset).
 	
         Reviewed by kocienda
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 28f6055..81efac0 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -369,10 +369,12 @@ static void addRun(BidiRun* bidiRun)
     // Compute the number of spaces in this run,
     if (bidiRun->obj && bidiRun->obj->isText()) {
         RenderText* text = static_cast<RenderText*>(bidiRun->obj);
-        for (int i = bidiRun->start; i < bidiRun->stop; i++) {
-            const QChar c = text->text()[i];
-            if (c == ' ' || c == '\n')
-                numSpaces++;
+        if (text->text()) {
+            for (int i = bidiRun->start; i < bidiRun->stop; i++) {
+                const QChar c = text->text()[i];
+                if (c == ' ' || c == '\n')
+                    numSpaces++;
+            }
         }
     }
 }

-- 
WebKit Debian packaging