diff options
| -rw-r--r-- | lib/rdoc/rdoc.rb | 5 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_options.rb | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb index ded4db9087..680a8612f7 100644 --- a/lib/rdoc/rdoc.rb +++ b/lib/rdoc/rdoc.rb @@ -162,11 +162,12 @@ class RDoc::RDoc RDoc.load_yaml begin - options = YAML.unsafe_load_file '.rdoc_options' + options = YAML.load_file '.rdoc_options', permitted_classes: [RDoc::Options, Symbol] rescue Psych::SyntaxError + raise RDoc::Error, "#{options_file} is not a valid rdoc options file" end - return RDoc::Options.new if options == false # Allow empty file. + return RDoc::Options.new unless options # Allow empty file. raise RDoc::Error, "#{options_file} is not a valid rdoc options file" unless RDoc::Options === options or Hash === options diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb index a79d5dfa31..2534c52c17 100644 --- a/test/rdoc/test_rdoc_options.rb +++ b/test/rdoc/test_rdoc_options.rb @@ -145,7 +145,7 @@ class TestRDocOptions < RDoc::TestCase @options.encoding = Encoding::IBM437 - options = YAML.unsafe_load YAML.dump @options + options = YAML.load(YAML.dump(@options), permitted_classes: [RDoc::Options, Symbol]) assert_equal Encoding::IBM437, options.encoding end @@ -161,7 +161,7 @@ rdoc_include: - /etc YAML - options = YAML.unsafe_load yaml + options = YAML.load(yaml, permitted_classes: [RDoc::Options, Symbol]) assert_empty options.rdoc_include assert_empty options.static_path @@ -749,7 +749,7 @@ rdoc_include: assert File.exist? '.rdoc_options' - assert_equal @options, YAML.unsafe_load(File.read('.rdoc_options')) + assert_equal @options, YAML.load(File.read('.rdoc_options'), permitted_classes: [RDoc::Options, Symbol]) end end |