Fix leftover output files and file handle leak when extraction fails

XADUnarchiver.m

@@ -414,6 +414,13 @@ -(XADError)_extractFileEntryWithDictionary:(NSDictionary *)dict as:(NSString *)d
 
 	[fh close];
 
+	// Remove the output file on any failure. This includes XADBreakError, which in
+	// most cases produces a partial file (cancellation is checked per 256KB chunk).
+	if(err!=XADNoError)
+	{
+		[XADPlatform removeItemAtPath:destpath];
+	}
+
 	return err;
 }
 
@@ -498,20 +505,30 @@ -(XADError)_extractResourceForkEntryWithDictionary:(NSDictionary *)dict asAppleD
 
 	NSDictionary *extattrs=[parser extendedAttributesForDictionary:dict];
 
+	XADError error=XADNoError;
 	@try
 	{
 		// TODO: Should this function handle exceptions itself?
-		[XADAppleDouble writeAppleDoubleHeaderToHandle:fh resourceForkSize:(int)ressize
-		extendedAttributes:extattrs];
+		[XADAppleDouble writeAppleDoubleHeaderToHandle:fh
+									  resourceForkSize:(int)ressize
+									extendedAttributes:extattrs];
+		if(ressize)
+		{
+			error=[self runExtractorWithDictionary:dict outputHandle:fh];
+		}
+	} @catch(id e) {
+		error=[XADException parseException:e];
 	}
-	@catch(id e) { return [XADException parseException:e]; }
-
-	// Write resource fork.
-	XADError error=XADNoError;
-	if(ressize) error=[self runExtractorWithDictionary:dict outputHandle:fh];
 
 	[fh close];
 
+	// Remove the output file on any failure. This includes XADBreakError, which in
+	// most cases produces a partial file (cancellation is checked per 256KB chunk).
+	if(error!=XADNoError)
+	{
+		[XADPlatform removeItemAtPath:destpath];
+	}
+
 	return error;
 }