usa	2013-02-22 18:37:09 +0900 (Fri, 22 Feb 2013)

  New Revision: 39385

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39385

  Log:
    merge revision(s) 39384:
    
    * lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
      new attribute to read/write entity expansion text limit.  the default
      limit is 10Kb.
    
    * lib/rexml/text.rb (REXML::Text.unnormalize): check above attribute.

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/rexml/document.rb
    branches/ruby_1_9_3/lib/rexml/text.rb
    branches/ruby_1_9_3/test/rexml/test_entity.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 39384)
+++ ruby_1_9_3/ChangeLog	(revision 39385)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Fri Feb 22 18:36:51 2013  Aaron Patterson <aaron@t...>
+
+	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
+	  new attribute to read/write entity expansion text limit.  the default
+	  limit is 10Kb.
+
+	* lib/rexml/text.rb (REXML::Text.unnormalize): check above attribute.
+
 Fri Feb 22 14:48:15 2013  NARUSE, Yui  <naruse@r...>
 
 	* vm.c (vm_exec): get rid of a SEGV when calling rb_iter_break() from
Index: ruby_1_9_3/lib/rexml/document.rb
===================================================================
--- ruby_1_9_3/lib/rexml/document.rb	(revision 39384)
+++ ruby_1_9_3/lib/rexml/document.rb	(revision 39385)
@@ -217,6 +217,18 @@ module REXML https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/rexml/document.rb#L217
       return @@entity_expansion_limit
     end
 
+    @@entity_expansion_text_limit = 10_240
+
+    # Set the entity expansion limit. By default the limit is set to 10240.
+    def Document::entity_expansion_text_limit=( val )
+      @@entity_expansion_text_limit = val
+    end
+
+    # Get the entity expansion limit. By default the limit is set to 10000.
+    def Document::entity_expansion_text_limit
+      return @@entity_expansion_text_limit
+    end
+
     attr_reader :entity_expansion_count
 
     def record_entity_expansion
Index: ruby_1_9_3/lib/rexml/text.rb
===================================================================
--- ruby_1_9_3/lib/rexml/text.rb	(revision 39384)
+++ ruby_1_9_3/lib/rexml/text.rb	(revision 39385)
@@ -380,25 +380,35 @@ module REXML https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/rexml/text.rb#L380
 
     # Unescapes all possible entities
     def Text::unnormalize( string, doctype=nil, filter=nil, illegal=nil )
+      sum = 0
       string.gsub( /\r\n?/, "\n" ).gsub( REFERENCE ) {
-        ref = $&
-        if ref[1] == ?#
-          if ref[2] == ?x
-            [ref[3...-1].to_i(16)].pack('U*')
-          else
-            [ref[2...-1].to_i].pack('U*')
-          end
-        elsif ref == '&amp;'
-          '&'
-        elsif filter and filter.include?( ref[1...-1] )
-          ref
-        elsif doctype
-          doctype.entity( ref[1...-1] ) or ref
+        s = Text.expand($&, doctype, filter)
+        if sum + s.bytesize > Document.entity_expansion_text_limit
+          raise "entity expansion has grown too large"
         else
-          entity_value = DocType::DEFAULT_ENTITIES[ ref[1...-1] ]
-          entity_value ? entity_value.value : ref
+          sum += s.bytesize
         end
+        s
       }
     end
+
+    def Text.expand(ref, doctype, filter)
+      if ref[1] == ?#
+        if ref[2] == ?x
+          [ref[3...-1].to_i(16)].pack('U*')
+        else
+          [ref[2...-1].to_i].pack('U*')
+        end
+      elsif ref == '&amp;'
+        '&'
+      elsif filter and filter.include?( ref[1...-1] )
+        ref
+      elsif doctype
+        doctype.entity( ref[1...-1] ) or ref
+      else
+        entity_value = DocType::DEFAULT_ENTITIES[ ref[1...-1] ]
+        entity_value ? entity_value.value : ref
+      end
+    end
   end
 end
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 39384)
+++ ruby_1_9_3/version.h	(revision 39385)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 391
+#define RUBY_PATCHLEVEL 392
 
 #define RUBY_RELEASE_DATE "2013-02-22"
 #define RUBY_RELEASE_YEAR 2013
Index: ruby_1_9_3/test/rexml/test_entity.rb
===================================================================
--- ruby_1_9_3/test/rexml/test_entity.rb	(revision 39384)
+++ ruby_1_9_3/test/rexml/test_entity.rb	(revision 39385)
@@ -104,6 +104,24 @@ class EntityTester < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/test/rexml/test_entity.rb#L104
     assert_equal source, out
   end
 
+  def test_entity_string_limit
+    template = '<!DOCTYPE bomb [ <!ENTITY a "^" > ]> <bomb>$</bomb>'
+    len      = 5120 # 5k per entity
+    template.sub!(/\^/, "B" * len)
+
+    # 10k is OK
+    entities = '&a;' * 2 # 5k entity * 2 = 10k
+    xmldoc = REXML::Document.new(template.sub(/\$/, entities))
+    assert_equal(len * 2, xmldoc.root.text.bytesize)
+
+    # above 10k explodes
+    entities = '&a;' * 3 # 5k entity * 2 = 15k
+    xmldoc = REXML::Document.new(template.sub(/\$/, entities))
+    assert_raises(RuntimeError) do
+      xmldoc.root.text
+    end
+  end
+
   def test_raw
     source = '<!DOCTYPE foo [
 <!ENTITY ent "replace">

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39384


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/