diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-27 11:23:17 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-27 11:23:17 +0000 |
| commit | d86ba46a65734423c05cb399c61f096db4f82712 (patch) | |
| tree | 8269cb0ca105be1a161ee5ed96a2ab1859cf1dd5 /lib | |
| parent | eca3835c65f6e63b92dd5387257322323ab43563 (diff) | |
merge revision(s) r48161:
* 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/branches/ruby_2_1@48163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rexml/entity.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/rexml/entity.rb b/lib/rexml/entity.rb index 39f3900075..f447202394 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 |