[webkit-changes] cvs commit: LayoutTests/fast/xsl/resources xslt-entity.xsl

[Darin]

darin       05/12/12 09:01:42

  Modified:    .        ChangeLog
               khtml/xsl xsl_stylesheetimpl.cpp
               .        ChangeLog
  Added:       fast/xsl xslt-entity-expected.checksum
                        xslt-entity-expected.png xslt-entity-expected.txt
                        xslt-entity.xml
               fast/xsl/resources xslt-entity.xsl
  Log:
  LayoutTests:
  
          Reviewed by Eric.
  
          Test case for http://bugzilla.opendarwin.org/show_bug.cgi?id=5538
  
          * fast/xsl/resources/xslt-entity.xsl: Added.
          * fast/xsl/xslt-entity-expected.checksum: Added.
          * fast/xsl/xslt-entity-expected.png: Added.
          * fast/xsl/xslt-entity-expected.txt: Added.
          * fast/xsl/xslt-entity.xml: Added.
  
  WebCore:
  
          Reviewed by Eric.
  
          - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5538
            XSLT crashes with multi-word internal entity declarations
  
          Added the crashing specimen as a layout test.
  
          * khtml/xsl/xsl_stylesheetimpl.cpp: (DOM::XSLStyleSheetImpl::loadChildSheets):
          Check that the node is an element node before calling IS_XSLT_ELEM.
  
  Revision  Changes    Path
  1.511     +12 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.510
  retrieving revision 1.511
  diff -u -r1.510 -r1.511
  --- ChangeLog	11 Dec 2005 11:41:58 -0000	1.510
  +++ ChangeLog	12 Dec 2005 17:01:36 -0000	1.511
  @@ -1,3 +1,15 @@
  +2005-12-11  Darin Adler  <darin at apple.com>
  +
  +        Reviewed by Eric.
  +
  +        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5538
  +          XSLT crashes with multi-word internal entity declarations
  +
  +        Added the crashing specimen as a layout test.
  +
  +        * khtml/xsl/xsl_stylesheetimpl.cpp: (DOM::XSLStyleSheetImpl::loadChildSheets):
  +        Check that the node is an element node before calling IS_XSLT_ELEM.
  +
   2005-12-11  Eric Seidel  <eseidel at apple.com>
   
           Reviewed by darin & mjs.
  
  
  
  1.6       +2 -2      WebCore/khtml/xsl/xsl_stylesheetimpl.cpp
  
  Index: xsl_stylesheetimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xsl/xsl_stylesheetimpl.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- xsl_stylesheetimpl.cpp	25 Oct 2005 00:07:48 -0000	1.5
  +++ xsl_stylesheetimpl.cpp	12 Dec 2005 17:01:40 -0000	1.6
  @@ -148,7 +148,7 @@
                   curr = curr->next;
                   continue;
               }
  -            if (IS_XSLT_ELEM(curr) && IS_XSLT_NAME(curr, "import")) {
  +            if (curr->type == XML_ELEMENT_NODE && IS_XSLT_ELEM(curr) && IS_XSLT_NAME(curr, "import")) {
                   xmlChar* uriRef = xsltGetNsProp(curr, (const xmlChar *)"href", XSLT_NAMESPACE);
                   QString buff = QString::fromUtf8((const char*)uriRef);
                   loadChildSheet(buff);
  @@ -159,7 +159,7 @@
   
           // Now handle includes.
           while (curr) {
  -            if (IS_XSLT_ELEM(curr) && IS_XSLT_NAME(curr, "include")) {
  +            if (curr->type == XML_ELEMENT_NODE && IS_XSLT_ELEM(curr) && IS_XSLT_NAME(curr, "include")) {
                   xmlChar* uriRef = xsltGetNsProp(curr, (const xmlChar *)"href", XSLT_NAMESPACE);
                   QString buff = QString::fromUtf8((const char*)uriRef);
                   loadChildSheet(buff);
  
  
  
  1.142     +12 -0     LayoutTests/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/LayoutTests/ChangeLog,v
  retrieving revision 1.141
  retrieving revision 1.142
  diff -u -r1.141 -r1.142
  --- ChangeLog	12 Dec 2005 04:23:14 -0000	1.141
  +++ ChangeLog	12 Dec 2005 17:01:40 -0000	1.142
  @@ -1,3 +1,15 @@
  +2005-12-12  Darin Adler  <darin at apple.com>
  +
  +        Reviewed by Eric.
  +
  +        Test case for http://bugzilla.opendarwin.org/show_bug.cgi?id=5538
  +
  +        * fast/xsl/resources/xslt-entity.xsl: Added.
  +        * fast/xsl/xslt-entity-expected.checksum: Added.
  +        * fast/xsl/xslt-entity-expected.png: Added.
  +        * fast/xsl/xslt-entity-expected.txt: Added.
  +        * fast/xsl/xslt-entity.xml: Added.
  +
   2005-12-11  Eric Seidel  <eseidel at apple.com>
   
           Adding pixel results omitted from previous commits.
  
  
  
  1.1                  LayoutTests/fast/xsl/xslt-entity-expected.checksum
  
  Index: xslt-entity-expected.checksum
  ===================================================================
  1086fa6162aa6435aad342412ddca1df
  
  
  1.1                  LayoutTests/fast/xsl/xslt-entity-expected.png
  
  	<<Binary file>>
  
  
  1.1                  LayoutTests/fast/xsl/xslt-entity-expected.txt
  
  Index: xslt-entity-expected.txt
  ===================================================================
  layer at (0,0) size 800x600
    RenderCanvas at (0,0) size 800x600
  layer at (0,0) size 800x18
    RenderBlock {P} at (0,0) size 800x18
      RenderText {TEXT} at (0,0) size 142x18
        text run at (0,0) width 142: "Hello World, Success!"
  
  
  
  1.1                  LayoutTests/fast/xsl/xslt-entity.xml
  
  Index: xslt-entity.xml
  ===================================================================
  <?xml version="1.0" ?>
  <?xml-stylesheet type="text/xsl" href="resources/xslt-entity.xsl"?>
  
  <TEST />
  
  
  
  1.1                  LayoutTests/fast/xsl/resources/xslt-entity.xsl
  
  Index: xslt-entity.xsl
  ===================================================================
  <?xml version="1.0" encoding="utf-8" ?>
  <!DOCTYPE test-document [
  <!ENTITY HELLO "Hello World, Success!">
  ]>
  <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
      <xsl:template match="/">
  		<P>&HELLO;</P>
      </xsl:template>
  </xsl:stylesheet>