stop userfile decode/thaw crashes

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 419086adaa1230ef09e55772dc7fc17f625195f0..c611fac376ca54605fa6967dd6e43d87d68dc787 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -247,15 +247,15 @@ sub get
        
        # search for it
        unless ($dbm->get($call, $data)) {
-               $ref = decode($data);
+               $ref = eval{decode($data)};
                if ($ref) {
-                       if (UNIVERSAL::isa($ref, 'DXUser')) {
-                               dbg("DXUser::get: got strange answer from decode ". ref $ref. " ignoring");
+                       if (!UNIVERSAL::isa($ref, 'DXUser')) {
+                               dbg("DXUser::get: got strange answer from decode of $call". ref $ref. " ignoring");
                                return undef;
                        }
                        # we have a reference and it *is* a DXUser
                } else {
-                       dbg("DXUser::get: no reference returned from decode $!");
+                       dbg("DXUser::get: no reference returned from decode of $call $! $@");
                        return undef;
                }
                $lru->put($call, $ref);
@@ -281,7 +281,7 @@ sub get_current
                my $ref = $dxchan->user;
                return $ref if $ref && UNIVERSAL::isa($ref, 'DXUser');
 
-               dbg("DXUser::get_current: got invalid user ref from dxchan $dxchan->{call} ". ref $ref. " ignoring");
+               dbg("DXUser::get_current: got invalid user ref for $call from dxchan $dxchan->{call} ". ref $ref. " ignoring");
        }
        return get($call);
 }