From 971b99f3ed87560ad1523f1442ec0a842fa2606b Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 30 Jun 2017 12:58:41 +0000
Subject: [PATCH] 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_3@59239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                         |  6 ++++++
 lib/rexml/parsers/streamparser.rb |  8 ++++++++
 test/rexml/parser/test_stream.rb  | 32 +++++++++++++++++++++++++++++++
 version.h                         |  2 +-
 4 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 test/rexml/parser/test_stream.rb

diff --git a/ChangeLog b/ChangeLog
index 0cb90b31d8..e720ed959b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jun 30 21:57:27 2017  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/streamparser.rb: add close tag check on end of
+	  document to StreamParser [Bug #13636]
+	  Reported by Anton Sivakov. Thanks!!!
+
 Fri Jun 30 21:54:01 2017  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* array.c (rb_ary_insert): check position to insert even if no elements
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 )
diff --git a/test/rexml/parser/test_stream.rb b/test/rexml/parser/test_stream.rb
new file mode 100644
index 0000000000..c315833e4b
--- /dev/null
+++ b/test/rexml/parser/test_stream.rb
@@ -0,0 +1,32 @@
+require "test/unit"
+require "rexml/document"
+require "rexml/streamlistener"
+
+module REXMLTests
+  class TestStreamParser < Test::Unit::TestCase
+    class NullListener
+      include REXML::StreamListener
+    end
+
+    class TestInvalid < self
+      def test_no_end_tag
+        xml = "<root><sub>"
+        exception = assert_raise(REXML::ParseException) do
+          parse(xml)
+        end
+        assert_equal(<<-MESSAGE, exception.to_s)
+Missing end tag for '/root/sub'
+Line: 1
+Position: #{xml.bytesize}
+Last 80 unconsumed characters:
+        MESSAGE
+      end
+
+      private
+      def parse(xml, listener=nil)
+        listener ||= NullListener.new
+        REXML::Document.parse_stream(xml, listener)
+      end
+    end
+  end
+end
diff --git a/version.h b/version.h
index 5e2cb95d50..32b682a153 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.5"
 #define RUBY_RELEASE_DATE "2017-06-30"
-#define RUBY_PATCHLEVEL 335
+#define RUBY_PATCHLEVEL 336
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 6