Max/korenkonder_ReDIVA
1
0
Fork 0
mirror of https://github.com/korenkonder/ReDIVA.git synced 2026-10-03 20:28:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix reading of uncompressed entries in FArC

Browse Source
This commit is contained in:
korenkonder
2023-07-17 10:28:47 +03:00
parent 357dba8f2c
commit a72422da0a
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/KKdLib/farc.cpp
+24 -4
View File
@@ -873,10 +873,18 @@ static void farc_unpack_file(farc* f, stream& s, farc_file* ff, bool save, char*
s.read(ff->data, ff->size);
}
else if (f->signature == FARC_FArC) {
ff->data_compressed = force_malloc(ff->size_compressed);
s.read(ff->data_compressed, ff->size_compressed);
deflate::decompress(ff->data_compressed, ff->size_compressed,
&ff->data, &ff->size, deflate::MODE_GZIP);
if (ff->size) {
ff->data_compressed = force_malloc(ff->size_compressed);
s.read(ff->data_compressed, ff->size_compressed);
deflate::decompress(ff->data_compressed, ff->size_compressed,
&ff->data, &ff->size, deflate::MODE_GZIP);
}
else {
ff->data = force_malloc(ff->size_compressed);
s.read(ff->data, ff->size_compressed);
ff->size = ff->size_compressed;
ff->size_compressed = 0;
}
}
else if (ff->flags) {
size_t temp_s = ff->flags & FARC_AES
@@ -907,6 +915,18 @@ static void farc_unpack_file(farc* f, stream& s, farc_file* ff, bool save, char*
memcpy(ff->data_compressed, (void*)t, ff->size_compressed);
deflate::decompress(ff->data_compressed, ff->size_compressed,
&ff->data, &ff->size, deflate::MODE_GZIP);
if (ff->size) {
ff->data_compressed = force_malloc(ff->size_compressed);
memcpy(ff->data_compressed, (void*)t, ff->size_compressed);
deflate::decompress(ff->data_compressed, ff->size_compressed,
&ff->data, &ff->size, deflate::MODE_GZIP);
}
else {
ff->data = force_malloc(ff->size_compressed);
memcpy(ff->data, (void*)t, ff->size_compressed);
ff->size = ff->size_compressed;
ff->size_compressed = 0;
}
}
else {
ff->data_compressed = 0;