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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 9c0d6a75ff8e076260f14e5aa40857a677823981
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 28 16:21:56 2004 +0000

            Reviewed by Ken.
    
            - fixed <rdar://problem/3636261>: "nil-deref in selectedStylesheetSet iterating through properties in a non-view document"
    
            * khtml/xml/dom_docimpl.cpp:
            (DocumentImpl::selectedStylesheetSet): Add nil check.
            (DocumentImpl::setSelectedStylesheetSet): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6501 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7413c81..5cd0d3a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-04-28  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed <rdar://problem/3636261>: "nil-deref in selectedStylesheetSet iterating through properties in a non-view document"
+
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::selectedStylesheetSet): Add nil check.
+        (DocumentImpl::setSelectedStylesheetSet): Ditto.
+
 2004-04-27  Richard Williamson   <rjw at apple.com>
 
 	<rdar://problem/3564519>: API: please add a way to set the media type for a WebView
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 1b074d4..8cd8319 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -2015,16 +2015,18 @@ DocumentImpl::preferredStylesheetSet()
 DOMString 
 DocumentImpl::selectedStylesheetSet()
 {
-  return view()->part()->d->m_sheetUsed;
+  return view() ? view()->part()->d->m_sheetUsed : DOMString();
 }
 
 void 
 DocumentImpl::setSelectedStylesheetSet(const DOMString& aString)
 {
-  view()->part()->d->m_sheetUsed = aString.string();
-  updateStyleSelector();
-  if (renderer())
-    renderer()->repaint();
+  if (view()) {
+    view()->part()->d->m_sheetUsed = aString.string();
+    updateStyleSelector();
+    if (renderer())
+      renderer()->repaint();
+  }
 }
 
 // This method is called whenever a top-level stylesheet has finished loading.

-- 
WebKit Debian packaging