Merge pull request #41 from ruby/dbm-psych-4-2nd

Also use safe_load on YAML::Store
ruby · Oct 16, 2024 · 8259763 · 8259763
2 parents 729575f + 5b39653
commit 8259763
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/lib/yaml/store.rb b/lib/yaml/store.rb
@@ -69,8 +69,16 @@ def dump(table)
   end
 
   def load(content)
-    table = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(content) : YAML.load(content)
-    if table == false
+    table =  if YAML.respond_to?(:safe_load)
+      if Psych::VERSION >= "3.1"
+        YAML.safe_load(content, permitted_classes: [Symbol])
+      else
+        YAML.safe_load(content, [Symbol])
+      end
+    else
+      YAML.load(content)
+    end
+    if table == false || table == nil
       {}
     else
       table