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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 75bde929f0f7307b2cafd75e1347781bc87f3f92
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 12 23:25:54 2003 +0000

            - fixed <rdar://problem/3508825>: REGRESSION (100-116): crash in
            HTMLGenericFormElementImpl::attach at sonyericsson.com
    
            Reviewed by Maciej.
    
            * khtml/html/html_formimpl.cpp:
            (HTMLGenericFormElementImpl::attach):
            Move a few lines inside an existing nil check to prevent nil dereference.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5784 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9455f32..0f565b7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-12-12  John Sullivan  <sullivan at apple.com>
 
+        - fixed <rdar://problem/3508825>: REGRESSION (100-116): crash in 
+        HTMLGenericFormElementImpl::attach at sonyericsson.com
+
+        Reviewed by Maciej.
+
+        * khtml/html/html_formimpl.cpp:
+        (HTMLGenericFormElementImpl::attach):
+        Move a few lines inside an existing nil check to prevent nil dereference.
+
+2003-12-12  John Sullivan  <sullivan at apple.com>
+
         - fixed <rdar://problem/3508760>: tabbing to out-of-sight link behaves 
         differently than tabbing to out-of-sight form control
 
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index 546a249..b6db093 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -761,17 +761,18 @@ void HTMLGenericFormElementImpl::attach()
     // The call to updateFromElement() needs to go after the call through
     // to the base class's attach() because that can sometimes do a close
     // on the renderer.
-    if (m_render)
+    if (m_render) {
         m_render->updateFromElement();
     
-    // Delayed attachment in order to prevent FOUC can result in an object being
-    // programmatically focused before it has a render object.  If we have been focused
-    // (i.e., if we are the focusNode) then go ahead and focus our corresponding native widget.
-    // (Attach/detach can also happen as a result of display type changes, e.g., making a widget
-    // block instead of inline, and focus should be restored in that case as well.)
-    if (getDocument()->focusNode() == this && m_render->isWidget() && 
-        static_cast<RenderWidget*>(renderer())->widget())
-        static_cast<RenderWidget*>(renderer())->widget()->setFocus();
+        // Delayed attachment in order to prevent FOUC can result in an object being
+        // programmatically focused before it has a render object.  If we have been focused
+        // (i.e., if we are the focusNode) then go ahead and focus our corresponding native widget.
+        // (Attach/detach can also happen as a result of display type changes, e.g., making a widget
+        // block instead of inline, and focus should be restored in that case as well.)
+        if (getDocument()->focusNode() == this && m_render->isWidget() && 
+            static_cast<RenderWidget*>(renderer())->widget())
+            static_cast<RenderWidget*>(renderer())->widget()->setFocus();
+    }
 }
 
 HTMLFormElementImpl *HTMLGenericFormElementImpl::getForm() const

-- 
WebKit Debian packaging