summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-07-23 07:33:07 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-07-23 07:33:07 +0000
commit3fd2cbecff6f9c3e7dbb3bc171b4321266ff183f (patch)
treed3381d41d669f0fbf530148850d302e5467ca925 /lib
parentacfaa3311c7475012c984c4998b43f5f0dd84e70 (diff)
merge revision(s) 59033,59034: [Backport #13636]
rexml: add close tag check on end of document to StreamParser [ruby-core:81593] [Bug #13636] Reported by Anton Sivakov. Thanks!!! * properties. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59399 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/rexml/parsers/streamparser.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/rexml/parsers/streamparser.rb b/lib/rexml/parsers/streamparser.rb
index b271e6743e..f6a8bfa802 100644
--- a/lib/rexml/parsers/streamparser.rb
+++ b/lib/rexml/parsers/streamparser.rb
@@ -7,6 +7,7 @@ module REXML
def initialize source, listener
@listener = listener
@parser = BaseParser.new( source )
+ @tag_stack = []
end
def add_listener( listener )
@@ -19,14 +20,21 @@ module REXML
event = @parser.pull
case event[0]
when :end_document
+ unless @tag_stack.empty?
+ tag_path = "/" + @tag_stack.join("/")
+ raise ParseException.new("Missing end tag for '#{tag_path}'",
+ @parser.source)
+ end
return
when :start_element
+ @tag_stack << event[1]
attrs = event[2].each do |n, v|
event[2][n] = @parser.unnormalize( v )
end
@listener.tag_start( event[1], attrs )
when :end_element
@listener.tag_end( event[1] )
+ @tag_stack.pop
when :text
normalized = @parser.unnormalize( event[1] )
@listener.text( normalized )