[webkit-changes] cvs commit: WebCore/khtml/html html_formimpl.cpp

[Timothy]

thatcher    05/11/18 10:02:47

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/html Tag: Safari-2-0-branch html_formimpl.cpp
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      2005-11-17  Adele Peterson  <adele at apple.com>
  
          Reviewed by Beth.
  
          - fix for <rdar://problem/4347856> Safari crash after browsing Fandango.
  
          When removeFormElement is getting called in a destructor, there may not be a document.
          So we don't need to worry about cleaning up the radio buttons in this case, not only to
          avoid the crash, but also because the document's destructor will clean that up.
  
          * khtml/html/html_formimpl.cpp:
          (DOM::HTMLFormElementImpl::removeFormElement): Added nil check for document.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.70  +17 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.69
  retrieving revision 1.1.2.70
  diff -u -r1.1.2.69 -r1.1.2.70
  --- ChangeLog	17 Nov 2005 22:24:42 -0000	1.1.2.69
  +++ ChangeLog	18 Nov 2005 18:02:32 -0000	1.1.2.70
  @@ -1,3 +1,20 @@
  +2005-11-18  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
  +    2005-11-17  Adele Peterson  <adele at apple.com>
  +
  +        Reviewed by Beth.
  +
  +        - fix for <rdar://problem/4347856> Safari crash after browsing Fandango.
  +
  +        When removeFormElement is getting called in a destructor, there may not be a document.
  +        So we don't need to worry about cleaning up the radio buttons in this case, not only to
  +        avoid the crash, but also because the document's destructor will clean that up.
  +
  +        * khtml/html/html_formimpl.cpp:
  +        (DOM::HTMLFormElementImpl::removeFormElement): Added nil check for document.
  +
   2005-11-17  Timothy Hatcher  <timothy at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.156.6.7 +1 -1      WebCore/khtml/html/html_formimpl.cpp
  
  Index: html_formimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_formimpl.cpp,v
  retrieving revision 1.156.6.6
  retrieving revision 1.156.6.7
  diff -u -r1.156.6.6 -r1.156.6.7
  --- html_formimpl.cpp	14 Nov 2005 23:03:22 -0000	1.156.6.6
  +++ html_formimpl.cpp	18 Nov 2005 18:02:44 -0000	1.156.6.7
  @@ -735,7 +735,7 @@
   
   void HTMLFormElementImpl::removeFormElement(HTMLGenericFormElementImpl *e)
   {
  -    if (!e->name().isEmpty()) {
  +    if (!e->name().isEmpty() && getDocument()) {
           HTMLGenericFormElementImpl* currentCheckedRadio = getDocument()->checkedRadioButtonForGroup(e->name(), this);
           if (currentCheckedRadio == e)
               getDocument()->removeRadioButtonGroup(e->name(), this);