testbot/TestAgent: Fix GetFile()'s error handling.

Francois Gouget fgouget at codeweavers.com
Mon Feb 25 09:53:03 CST 2013


---
 testbot/lib/WineTestBot/TestAgent.pm |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm
index 0e5eb4d..cda83a8 100644
--- a/testbot/lib/WineTestBot/TestAgent.pm
+++ b/testbot/lib/WineTestBot/TestAgent.pm
@@ -310,7 +310,7 @@ sub _RecvEntryHeader($)
   return ($Type, $High << 32 | $Low);
 }
 
-sub _ExpectEntryHeader($$$)
+sub _ExpectEntryHeader($$;$)
 {
   my ($self, $Type, $Size) = @_;
 
@@ -391,7 +391,7 @@ sub _RecvFile($$$)
   return undef if (!defined $self->{fd});
   debug("  RecvFile($Filename)\n");
 
-  my $Size = $self->_RecvEntryHeader('d');
+  my $Size = $self->_ExpectEntryHeader('d');
   return undef if (!defined $Size);
 
   my $Success;
@@ -1013,6 +1013,7 @@ sub GetFile($$$)
   {
     my $Success = $self->_GetFileOrString($ServerPathName, $LocalPathName, $fh);
     close($fh);
+    unlink $LocalPathName if (!$Success);
     return $Success;
   }
   $self->_SetError($ERROR, "Unable to open '$LocalPathName' for writing: $!");
-- 
1.7.10.4




More information about the wine-patches mailing list