Imported the REXML patches.

Author: postmodern

security/20080823rexml/rexml-expansion-fix.rb

@@ -0,0 +1,43 @@
+# Copyright (c) 2008 Michael Koziarski <[email protected]>
+# 
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+require 'rexml/document'
+require 'rexml/entity'
+
+module REXML
+  class Entity < Child
+    def unnormalized
+      document.record_entity_expansion!
+      v = value()
+      return nil if v.nil?
+      @unnormalized = Text::unnormalize(v, parent)
+      @unnormalized
+    end
+  end
+  class Document < Element
+    @@entity_expansion_limit = 10_000
+    def self.entity_expansion_limit= val
+      @@entity_expansion_limit = val
+    end
+    
+    def record_entity_expansion!
+      @number_of_expansions ||= 0
+      @number_of_expansions += 1
+      if @number_of_expansions > @@entity_expansion_limit
+        raise "Number of entity expansions exceeded, processing aborted."
+      end
+    end
+  end
+end
+

security/20080823rexml/rexml-expansion-fix2.rb

@@ -0,0 +1,43 @@
+# Copyright (c) 2008 Michael Koziarski <[email protected]>
+# 
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+require 'rexml/document'
+require 'rexml/entity'
+
+module REXML
+  class Entity < Child
+    def unnormalized
+      document.record_entity_expansion unless document.nil?
+      v = value()
+      return nil if v.nil?
+      @unnormalized = Text::unnormalize(v, parent)
+      @unnormalized
+    end
+  end
+  class Document < Element
+    @@entity_expansion_limit = 10_000
+    def self.entity_expansion_limit= val
+      @@entity_expansion_limit = val
+    end
+    
+    def record_entity_expansion!
+      @number_of_expansions ||= 0
+      @number_of_expansions += 1
+      if @number_of_expansions > @@entity_expansion_limit
+        raise "Number of entity expansions exceeded, processing aborted."
+      end
+    end
+  end
+end
+