diff options
| author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-11 09:08:21 +0000 |
|---|---|---|
| committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-11 09:08:21 +0000 |
| commit | 3e5f5f5ca4ca2594f102832b34fc08ae82d74c23 (patch) | |
| tree | 15b7c640e1308dac91acad9ddb4a92169e3e7b21 | |
| parent | ce89dedde34e7b0304a96423a6a0c6b4284043cc (diff) | |
| download | ruby-3e5f5f5ca4ca2594f102832b34fc08ae82d74c23.tar.gz | |
* lib/rexml/parsers/baseparser.rb
(REXML::Parsers::BaseParser#pull_event): Support optional NDATA
in parameter entity declaration.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/rexml/parsers/baseparser.rb | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sun Aug 11 18:07:39 2013 Kouhei Sutou <kou@cozmixng.org> + + * lib/rexml/parsers/baseparser.rb + (REXML::Parsers::BaseParser#pull_event): Support optional NDATA + in parameter entity declaration. + Sun Aug 11 17:54:07 2013 Kouhei Sutou <kou@cozmixng.org> * NEWS (REXML::Parsers::SAX2Parser): Add about this change. diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb index 597109b76c..6a08b8661d 100644 --- a/lib/rexml/parsers/baseparser.rb +++ b/lib/rexml/parsers/baseparser.rb @@ -283,7 +283,8 @@ module REXML # External reference match[3] = match[3][1..-2] # PUBID match[4] = match[4][1..-2] # HREF - # match is [ :entity, name, PUBLIC, pubid, href ] + match.delete_at(5) if match.size > 5 # Chop out NDATA decl + # match is [ :entity, name, PUBLIC, pubid, href(, ndata)? ] else match[2] = match[2][1..-2] match.pop if match.size == 4 |