Catch errors deserializing marshalled objects

fixes collectiveidea#906
afn · Jan 2, 2018 · 5a819c2 · 5a819c2
1 parent c7a42fb
commit 5a819c2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/delayed/psych_ext.rb b/lib/delayed/psych_ext.rb
@@ -74,7 +74,11 @@ def visit_Psych_Nodes_Mapping(object) # rubocop:disable CyclomaticComplexity, Me
  raise Delayed::DeserializationError, "DataMapper::ObjectNotFoundError, class: #{klass} (#{error.message})"
  end
  else
- super
+ begin
+ super
+ rescue Exception => error
+ raise Delayed::DeserializationError, "#{error.class}, class: #{klass} (#{error.message})"
+ end
  end
  end
 

diff --git a/spec/psych_ext_spec.rb b/spec/psych_ext_spec.rb
@@ -9,4 +9,14 @@
  expect(deserialized).to eq(BigDecimal('13.37'))
  end
  end
+
+ context 'errors' do
+ it 'raises a DeserializationError' do
+ yaml = <<-YAML
+--- !ruby/marshalable:Delegator
+ :__v2__:
+YAML
+ expect { Psych.load_dj(yaml) }.to raise_error Delayed::DeserializationError
+ end
+ end
 end