DarkStore-3DS/DarkStore
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/DarkStore.git synced 2026-07-03 00:39:02 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Don't try to write files if an achive error occurs

Browse Source 
also free everything for other errors
This commit is contained in:
Pk11
2021-01-09 13:42:26 -06:00
parent 09d4de2f08
commit fc26f885ba
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/utils/extract.cpp
+24 -3
View File
@@ -70,7 +70,11 @@ Result extractArchive(const std::string &archivePath, const std::string &wantedF
a = archive_read_new(); a = archive_read_new();
archive_read_support_format_all(a); archive_read_support_format_all(a);
if (archive_read_open_filename(a, archivePath.c_str(), 0x4000) != ARCHIVE_OK) return EXTRACT_ERROR_OPENFILE; if (archive_read_open_filename(a, archivePath.c_str(), 0x4000) != ARCHIVE_OK) {
archive_read_close(a);
archive_read_free(a);
return EXTRACT_ERROR_OPENFILE;
}
while(archive_read_next_header(a, &entry) == ARCHIVE_OK) { while(archive_read_next_header(a, &entry) == ARCHIVE_OK) {
if (archive_entry_size(entry) > 0) { /* Ignore folders. */ if (archive_entry_size(entry) > 0) { /* Ignore folders. */
@@ -92,14 +96,31 @@ Result extractArchive(const std::string &archivePath, const std::string &wantedF
uint sizeLeft = archive_entry_size(entry); uint sizeLeft = archive_entry_size(entry);
FILE *file = fopen(extractingFile.c_str(), "wb"); FILE *file = fopen(extractingFile.c_str(), "wb");
if (!file) return EXTRACT_ERROR_WRITEFILE; if (!file) {
archive_read_close(a);
archive_read_free(a);
return EXTRACT_ERROR_WRITEFILE;
}
u8 *buf = new u8[0x30000]; u8 *buf = new u8[0x30000];
if (!buf) return EXTRACT_ERROR_ALLOC; if (!buf) {
fclose(file);
archive_read_close(a);
archive_read_free(a);
return EXTRACT_ERROR_ALLOC;
}
while(sizeLeft > 0) { while(sizeLeft > 0) {
u64 toRead = std::min(0x30000u, sizeLeft); u64 toRead = std::min(0x30000u, sizeLeft);
ssize_t size = archive_read_data(a, buf, toRead); ssize_t size = archive_read_data(a, buf, toRead);
// Archive error, stop extracting
if(size < 0) {
fclose(file);
delete[] buf;
archive_read_close(a);
archive_read_free(a);
return EXTRACT_ERROR_ARCHIVE;
}
fwrite(buf, 1, size, file); fwrite(buf, 1, size, file);
sizeLeft -= size; sizeLeft -= size;
writeOffset += size; writeOffset += size;