summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Ziegler <austin@zieglers.ca>2014-10-15 15:55:19 -0400
committerAustin Ziegler <austin@zieglers.ca>2014-10-15 15:55:19 -0400
commitae1d1601bac4f0c27d8e7fee33a228f9ece0d779 (patch)
treee7b5ca1d176d8555f9907c9e029af679fa5de837
parent13139e85fe75e95f5bb389eb8abd6be428127730 (diff)
parent961846c56992b365b44b7cc626c6710a3f20dafe (diff)
downloadmime-types-ae1d1601bac4f0c27d8e7fee33a228f9ece0d779.tar.gz
Merge pull request #75 from chancancode/use_json_parse
Use `JSON.parse` to limit exposure
-rw-r--r--lib/mime/types/loader.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mime/types/loader.rb b/lib/mime/types/loader.rb
index 1aed4e1..1d91a96 100644
--- a/lib/mime/types/loader.rb
+++ b/lib/mime/types/loader.rb
@@ -197,7 +197,7 @@ class MIME::Types::Loader
# shipped with the mime-types library.
def load_from_json(filename)
require 'json'
- JSON.load(read_file(filename)).map { |type| MIME::Type.new(type) }
+ JSON.parse(read_file(filename)).map { |type| MIME::Type.new(type) }
end
private