* Fixed handling marked sections ending ]]]>

swi-to-yap · May 22, 2002 · 897fe96 · 897fe96
1 parent 24b3de7
commit 897fe96
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+* FIXED: Correctly handle marked sections ending in ]]]> rather than ]]>
+  Spotted by Adrian Boyko.
+
 * ADDED: xml_quote_attribute/2 and xml_quote_cdata/2, providing simple
   quote-support.
 

diff --git a/Test/cdata.sgml b/Test/cdata.sgml
@@ -0,0 +1,8 @@
+<!DOCTYPE test [
+<!ELEMENT test - - (#PCDATA)>
+]>
+
+<test>
+<![CDATA[[Ora Lassila]]]>
+</test>
+
diff --git a/Test/ok/cdata.ok b/Test/ok/cdata.ok
@@ -0,0 +1,2 @@
+[element(test, [], ['[Ora Lassila]'])].
+[].
diff --git a/parser.c b/parser.c
@@ -4493,7 +4493,7 @@ putchar_dtd_parser(dtd_parser *p, int chr)
       { p->cdata->size -= 3;		/* Delete chars for ]] */
 	pop_marked_section(p);
 	p->state = S_PCDATA;
-      } else
+      } else if ( f[CF_DSC] != chr )	/* if ]]], stay in this state */
         p->state = S_MSCDATA;
       return;
     }