Allow CodeRay to be run when $SAFE=1

rubys · rubys · commit f543c485ef3e · 2013-11-24T05:45:12.000-05:00
diff --git a/lib/coderay/encoder.rb b/lib/coderay/encoder.rb
@@ -10,7 +10,7 @@ module CodeRay
   module Encoders
     
     extend PluginHost
-    plugin_path File.dirname(__FILE__), 'encoders'
+    plugin_path File.dirname(__FILE__).untaint, 'encoders'
     
     # = Encoder
     #
diff --git a/lib/coderay/scanner.rb b/lib/coderay/scanner.rb
@@ -18,7 +18,7 @@ module CodeRay
   # See PluginHost.
   module Scanners
     extend PluginHost
-    plugin_path File.dirname(__FILE__), 'scanners'
+    plugin_path File.dirname(__FILE__).untaint, 'scanners'
     
     
     # = Scanner
diff --git a/lib/coderay/style.rb b/lib/coderay/style.rb
@@ -5,7 +5,7 @@ module CodeRay
   # See Plugin.
   module Styles
     extend PluginHost
-    plugin_path File.dirname(__FILE__), 'styles'
+    plugin_path File.dirname(__FILE__).untaint, 'styles'
     
     # Base class for styles.
     # 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ module CodeRay`
`10`	`10`	`module Encoders`
`11`	`11`
`12`	`12`	`extend PluginHost`
`13`		`- plugin_path File.dirname(__FILE__), 'encoders'`
	`13`	`+ plugin_path File.dirname(__FILE__).untaint, 'encoders'`
`14`	`14`
`15`	`15`	`# = Encoder`
`16`	`16`	`#`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ module CodeRay`
`5`	`5`	`# See Plugin.`
`6`	`6`	`module Styles`
`7`	`7`	`extend PluginHost`
`8`		`- plugin_path File.dirname(__FILE__), 'styles'`
	`8`	`+ plugin_path File.dirname(__FILE__).untaint, 'styles'`
`9`	`9`
`10`	`10`	`# Base class for styles.`
`11`	`11`	`#`