summaryrefslogtreecommitdiff
path: root/lib/rexml
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-27 11:18:02 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-27 11:18:02 +0000
commit9cdd297a2959c9c01eeee4a743b4777f28ffc9e4 (patch)
treed7f329f93fe513ee02b9bf2a5e9eb905aedfd475 /lib/rexml
parente45b215fdd16f4fefc8f97f2391ef532f10c8f50 (diff)
* lib/rexml/entity.rb: keep the entity size within the limitation.
reported by Willis Vandevanter <will@silentrobots.com> and patched by nahi. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rexml')
-rw-r--r--lib/rexml/entity.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/rexml/entity.rb b/lib/rexml/entity.rb
index 39f3900..f447202 100644
--- a/lib/rexml/entity.rb
+++ b/lib/rexml/entity.rb
@@ -138,8 +138,14 @@ module REXML
matches = @value.scan(PEREFERENCE_RE)
rv = @value.clone
if @parent
+ sum = 0
matches.each do |entity_reference|
entity_value = @parent.entity( entity_reference[0] )
+ if sum + entity_value.bytesize > Security.entity_expansion_text_limit
+ raise "entity expansion has grown too large"
+ else
+ sum += entity_value.bytesize
+ end
rv.gsub!( /%#{entity_reference.join};/um, entity_value )
end
end