WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-12-14 12:09:36 +00:00
Code Issues Projects Releases Wiki Activity

Migrate image storage from PICT to BMP

Browse Source
This commit is contained in:
elasota
2020-01-18 21:15:07 -05:00
parent 69ef542969
commit 93b4554961
28 changed files with 438 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
PortabilityLayer/ZipFileProxy.cpp
View File

@@ -163,24 +163,30 @@ namespace PortabilityLayer
return nullptr;
const size_t centralDirSize = eocd.m_centralDirectorySizeBytes;
void *centralDirImage = mm->Alloc(centralDirSize);
if (!centralDirImage)
return nullptr;
void *centralDirImage = nullptr;
ZipCentralDirectoryFileHeader **centralDirFiles = nullptr;
const size_t numFiles = eocd.m_numCentralDirRecords;
ZipCentralDirectoryFileHeader **centralDirFiles = static_cast<ZipCentralDirectoryFileHeader **>(mm->Alloc(sizeof(ZipCentralDirectoryFileHeader*) * numFiles));
if (!centralDirFiles)
if (centralDirSize > 0)
{
mm->Release(centralDirImage);
return nullptr;
}
centralDirImage = mm->Alloc(centralDirSize);
if (!centralDirImage)
return nullptr;
if (stream->Read(centralDirImage, centralDirSize) != centralDirSize)
{
mm->Release(centralDirFiles);
mm->Release(centralDirImage);
return nullptr;
centralDirFiles = static_cast<ZipCentralDirectoryFileHeader **>(mm->Alloc(sizeof(ZipCentralDirectoryFileHeader*) * numFiles));
if (!centralDirFiles)
{
mm->Release(centralDirImage);
return nullptr;
}
if (stream->Read(centralDirImage, centralDirSize) != centralDirSize)
{
mm->Release(centralDirFiles);
mm->Release(centralDirImage);
return nullptr;
}
}
bool failed = false;
@@ -246,7 +252,8 @@ namespace PortabilityLayer
return nullptr;
}
qsort(centralDirFiles, numFiles, sizeof(ZipCentralDirectoryFileHeader*), ZipDirectorySortPredicate);
if (numFiles)
qsort(centralDirFiles, numFiles, sizeof(ZipCentralDirectoryFileHeader*), ZipDirectorySortPredicate);
for (size_t i = 1; i < numFiles; i++)
{