nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[cmp] propagate decompression errors from bled

Browse source 
If, for example, you have a truncated gz-compressed file and try to
write it to disk, bled_uncompress_with_handles() will return an error.
Previously, this was not reported back to the user -- there's no
indication of any problem. If they're lucky, booting the
partially-written disk will fail in an obvious way, but better to report
an error sooner, even if we cannot give details.
This commit is contained in:
Will Thompson 2017-10-12 16:40:54 +01:00
parent 7f82dbf0fc
commit b95e87040b
No known key found for this signature in database
GPG key ID: 3422DC0D7AD482A7
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/format.c
View file

@ -1541,10 +1541,17 @@ static BOOL WriteDrive(HANDLE hPhysicalDrive, HANDLE hSourceImage)
LastRefresh = 0;
if (img_report.compression_type != BLED_COMPRESSION_NONE) {
int64_t bled_ret;
uprintf("Writing Compressed Image...");
bled_init(_uprintf, update_progress, &FormatStatus);
bled_uncompress_with_handles(hSourceImage, hPhysicalDrive, img_report.compression_type);
bled_ret = bled_uncompress_with_handles(hSourceImage, hPhysicalDrive, img_report.compression_type);
bled_exit();
if (bled_ret < 0 && SCODE_CODE(FormatStatus) != ERROR_CANCELLED) {
// Unfortunately, different compression backends return different negative error codes
uprintf("Writing compressed image failed: %" PRIi64, bled_ret);
FormatStatus = ERROR_SEVERITY_ERROR | FAC(FACILITY_STORAGE) | ERROR_WRITE_FAULT;
goto out;
}
} else {
uprintf(hSourceImage?"Writing Image...":"Zeroing drive...");
// Our buffer size must be a multiple of the sector size and *ALIGNED* to the sector size