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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit df6ba3658b372cd039e31088c33e1a04de5bce43
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 23 22:01:54 2002 +0000

        Fixed crasher 2935757.  I still need to investigate the root cause
        of this problem.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1208 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 752dd4c..8621453 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-05-23  Richard J. Williamson  <rjw at apple.com>
+
+    Fixed crasher 2935757.  I still need to investigate the root cause
+    of this problem.
+    
+	* khtml/rendering/render_text.cpp:
+	(RenderText::setText):
+
 2002-05-23  Kenneth Kocienda  <kocienda at apple.com>
 
         Fixes for these bugs:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 752dd4c..8621453 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-05-23  Richard J. Williamson  <rjw at apple.com>
+
+    Fixed crasher 2935757.  I still need to investigate the root cause
+    of this problem.
+    
+	* khtml/rendering/render_text.cpp:
+	(RenderText::setText):
+
 2002-05-23  Kenneth Kocienda  <kocienda at apple.com>
 
         Fixes for these bugs:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 752dd4c..8621453 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-05-23  Richard J. Williamson  <rjw at apple.com>
+
+    Fixed crasher 2935757.  I still need to investigate the root cause
+    of this problem.
+    
+	* khtml/rendering/render_text.cpp:
+	(RenderText::setText):
+
 2002-05-23  Kenneth Kocienda  <kocienda at apple.com>
 
         Fixes for these bugs:
diff --git a/WebCore/khtml/rendering/render_text.cpp b/WebCore/khtml/rendering/render_text.cpp
index 9e5508c..2b985e1 100644
--- a/WebCore/khtml/rendering/render_text.cpp
+++ b/WebCore/khtml/rendering/render_text.cpp
@@ -725,6 +725,10 @@ const QFont &RenderText::font()
 
 void RenderText::setText(DOMStringImpl *text, bool force)
 {
+#ifdef APPLE_CHANGES
+    if (!text)
+        return;
+#endif
     if( !force && str == text ) return;
     if(str) str->deref();
     str = text;

-- 
WebKit Debian packaging