[webkit-changes] cvs commit: WebCore/khtml/xml xml_tokenizer.cpp

[Vicki]

vicki       05/08/17 14:41:30

  Modified:    .        Tag: Safari-OC-branch ChangeLog
               khtml/xml Tag: Safari-OC-branch xml_tokenizer.cpp
  Log:
          Reviewed by Darin.
  
  	- fix <rdar://problem/4217250> REGRESSION (OC): crash loading XML file with <script> tag in it
  
          * khtml/xml/xml_tokenizer.cpp:
          (khtml::XMLTokenizer::startElement): make sure that elements that id themselves as scripts
          are also HTML elements
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.68.2.3 +10 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.68.2.2
  retrieving revision 1.4104.2.68.2.3
  diff -u -r1.4104.2.68.2.2 -r1.4104.2.68.2.3
  --- ChangeLog	4 Aug 2005 18:19:46 -0000	1.4104.2.68.2.2
  +++ ChangeLog	17 Aug 2005 21:41:22 -0000	1.4104.2.68.2.3
  @@ -1,3 +1,13 @@
  +2005-08-17  Vicki Murley  <vicki at apple.com>
  +
  +        Reviewed by Darin.
  +
  +	- fix <rdar://problem/4217250> REGRESSION (OC): crash loading XML file with <script> tag in it
  + 
  +        * khtml/xml/xml_tokenizer.cpp:
  +        (khtml::XMLTokenizer::startElement): make sure that elements that id themselves as scripts
  +        are also HTML elements
  +
   === WebCore-415.13.1 ===
   
   2005-08-04  Adele Peterson  <adele at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.30.8.1.2.1 +1 -1      WebCore/khtml/xml/xml_tokenizer.cpp
  
  Index: xml_tokenizer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/xml_tokenizer.cpp,v
  retrieving revision 1.30.8.1
  retrieving revision 1.30.8.1.2.1
  diff -u -r1.30.8.1 -r1.30.8.1.2.1
  --- xml_tokenizer.cpp	1 Jul 2005 22:46:57 -0000	1.30.8.1
  +++ xml_tokenizer.cpp	17 Aug 2005 21:41:30 -0000	1.30.8.1.2.1
  @@ -333,7 +333,7 @@
           m_currentNode = implicitTBody;
       }
   
  -    if (newElement->id() == ID_SCRIPT)
  +    if (newElement->isHTMLElement() && newElement->id() == ID_SCRIPT)
           static_cast<HTMLScriptElementImpl *>(newElement)->setCreatedByParser(true);
   
       if (m_currentNode->addChild(newElement)) {