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

[Adele]

adele       05/08/04 14:34:38

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/html Tag: Safari-2-0-branch htmlparser.cpp
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      2005-08-04  Adele Peterson  <adele at apple.com>
  
          Reviewed by John.
  
          - fixed <rdar://problem/4204496> REGRESSION(denver): repro crash in KHTMLParser::finished() downloading attachment at webmail.mac.com
          This regression was introduced by the fix for <rdar://problem/4084029>.  It was just missing a nil check.
  
          * khtml/html/htmlparser.cpp: (KHTMLParser::finished): added nil check for current.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.93 +13 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.92
  retrieving revision 1.4104.2.93
  diff -u -r1.4104.2.92 -r1.4104.2.93
  --- ChangeLog	4 Aug 2005 17:55:16 -0000	1.4104.2.92
  +++ ChangeLog	4 Aug 2005 21:34:31 -0000	1.4104.2.93
  @@ -1,5 +1,18 @@
   2005-08-04  Adele Peterson  <adele at apple.com>
   
  +        Merged fix from TOT to Safari-2-0-branch
  +
  +    2005-08-04  Adele Peterson  <adele at apple.com>
  +
  +        Reviewed by John.
  +
  +        - fixed <rdar://problem/4204496> REGRESSION(denver): repro crash in KHTMLParser::finished() downloading attachment at webmail.mac.com
  +        This regression was introduced by the fix for <rdar://problem/4084029>.  It was just missing a nil check.
  +
  +        * khtml/html/htmlparser.cpp: (KHTMLParser::finished): added nil check for current.
  +
  +2005-08-04  Adele Peterson  <adele at apple.com>
  +
          Merged fix from TOT to Safari-2-0-branch
   
       2005-08-04  Geoffrey Garen  <ggaren at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.92.6.3  +1 -1      WebCore/khtml/html/htmlparser.cpp
  
  Index: htmlparser.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/htmlparser.cpp,v
  retrieving revision 1.92.6.2
  retrieving revision 1.92.6.3
  diff -u -r1.92.6.2 -r1.92.6.3
  --- htmlparser.cpp	26 Jul 2005 20:44:04 -0000	1.92.6.2
  +++ htmlparser.cpp	4 Aug 2005 21:34:38 -0000	1.92.6.3
  @@ -1519,7 +1519,7 @@
   void KHTMLParser::finished()
   {
       // In the case of a completely empty document, here's the place to create the HTML element.
  -    if (current->isDocumentNode() && current->firstChild() == 0) {
  +    if (current && current->isDocumentNode() && current->firstChild() == 0) {
           insertNode(new HTMLHtmlElementImpl(document));
       }