aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2012-02-13 17:58:01 +0900
committerAaron Patterson <aaron.patterson@gmail.com>2012-02-20 16:02:45 -0800
commit71d8c77e5ac74c2aa20eff6b3d6a8b8ca24114d7 (patch)
treeb88264a8455be485f8fe11be969f629b7127171a
parentdcf0964d64903605c6dc9d2e149ca0e45bd2aea2 (diff)
downloadrails-71d8c77e5ac74c2aa20eff6b3d6a8b8ca24114d7.tar.gz
rails-71d8c77e5ac74c2aa20eff6b3d6a8b8ca24114d7.tar.bz2
rails-71d8c77e5ac74c2aa20eff6b3d6a8b8ca24114d7.zip
delete vulnerable AS::SafeBuffer#[]
-rw-r--r--activesupport/lib/active_support/core_ext/string/output_safety.rb6
-rw-r--r--activesupport/test/safe_buffer_test.rb6
2 files changed, 0 insertions, 12 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index 20c2befc57..7f158369f4 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -103,12 +103,6 @@ module ActiveSupport #:nodoc:
end
end
- def[](*args)
- new_safe_buffer = super
- new_safe_buffer.instance_eval { @dirty = false }
- new_safe_buffer
- end
-
def safe_concat(value)
raise SafeConcatError if dirty?
original_concat(value)
diff --git a/activesupport/test/safe_buffer_test.rb b/activesupport/test/safe_buffer_test.rb
index ff36af5c40..56f9a9a51a 100644
--- a/activesupport/test/safe_buffer_test.rb
+++ b/activesupport/test/safe_buffer_test.rb
@@ -113,12 +113,6 @@ class SafeBufferTest < ActiveSupport::TestCase
assert_kind_of NilClass, @buffer.slice("chipchop")
end
- test "Should initialize @dirty to false for new instance when sliced" do
- dirty = @buffer[0,0].send(:dirty?)
- assert_not_nil dirty
- assert !dirty
- end
-
test "clone_empty returns an empty buffer" do
assert_equal '', ActiveSupport::SafeBuffer.new('foo').clone_empty
end