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

[Vicki]

vicki       05/08/17 14:21:49

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/xml Tag: Safari-2-0-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.121 +10 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.120
  retrieving revision 1.4104.2.121
  diff -u -r1.4104.2.120 -r1.4104.2.121
  --- ChangeLog	17 Aug 2005 18:06:30 -0000	1.4104.2.120
  +++ ChangeLog	17 Aug 2005 21:21:41 -0000	1.4104.2.121
  @@ -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
  +
   2005-08-17  Adele Peterson  <adele at apple.com>
   
           Fixed merge error from last checkin.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.30.8.3  +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.2
  retrieving revision 1.30.8.3
  diff -u -r1.30.8.2 -r1.30.8.3
  --- xml_tokenizer.cpp	9 Aug 2005 17:34:36 -0000	1.30.8.2
  +++ xml_tokenizer.cpp	17 Aug 2005 21:21:48 -0000	1.30.8.3
  @@ -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)) {