diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/rexml/parsers/baseparser.rb | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sat Aug 10 12:47:19 2013 Kouhei Sutou <kou@cozmixng.org> + + * lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser): + Fix wrong constant name. "]>" pattern match is the same but + it is used for "<!DOCTYPE" end mark not "<![CDATA[" end mark. + Sat Aug 10 12:43:15 2013 Kouhei Sutou <kou@cozmixng.org> * lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser): diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb index e937b169be..5a0074e9f7 100644 --- a/lib/rexml/parsers/baseparser.rb +++ b/lib/rexml/parsers/baseparser.rb @@ -43,6 +43,7 @@ module REXML REFERENCE_RE = /#{REFERENCE}/ DOCTYPE_START = /\A\s*<!DOCTYPE\s/um + DOCTYPE_END = /\A\s*\]\s*>/um DOCTYPE_PATTERN = /\s*<!DOCTYPE\s+(.*?)(\[|>)/um ATTRIBUTE_PATTERN = /\s*(#{NAME_STR})\s*=\s*(["'])(.*?)\4/um COMMENT_START = /\A<!--/u @@ -322,9 +323,9 @@ module REXML raise REXML::ParseException.new( "error parsing notation: no matching pattern", @source ) end return [ :notationdecl, *vals ] - when CDATA_END + when DOCTYPE_END @document_status = :after_doctype - @source.match( CDATA_END, true ) + @source.match( DOCTYPE_END, true ) return [ :end_doctype ] end end |