Use safe_dup for DeepMerge#deep_merge to avoid TypeError

2 files changed, 5 insertions, 1 deletions

diff --git a/lib/chef/mixin/deep_merge.rb b/lib/chef/mixin/deep_merge.rb
index 9cddcbaed6..a8a4737758 100644
--- a/lib/chef/mixin/deep_merge.rb
+++ b/lib/chef/mixin/deep_merge.rb
@@ -168,7 +168,7 @@ class Chef
       end
 
       def deep_merge(source, dest)
-        deep_merge!(source.dup, dest.dup)
+        deep_merge!(safe_dup(source), safe_dup(dest))
       end
 
     end
diff --git a/spec/unit/mixin/deep_merge_spec.rb b/spec/unit/mixin/deep_merge_spec.rb
index a42b885283..76f5c68a29 100644
--- a/spec/unit/mixin/deep_merge_spec.rb
+++ b/spec/unit/mixin/deep_merge_spec.rb
@@ -284,6 +284,10 @@ describe Chef::Mixin::DeepMerge do
       ret.should == {"property" => ["1","2","3","4","5","6"]}
     end
 
+    it "should not error merging un-dupable objects" do
+      @dm.deep_merge(nil, 4)
+    end
+
   end
 
   describe "role_merge" do