ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash when opening ZIP files containing errors (including zero-byte files). 

This fixes a regression in behaviour from 5.1.
This commit is contained in:
Stephen Anthony 2018-09-04 11:23:10 -02:30
parent 4edd626a3a
commit b0aba8ae26
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/common/FSNodeZIP.cxx
View File

@ -47,8 +47,18 @@ FilesystemNodeZIP::FilesystemNodeZIP(const string& p)
_zipFile = p.substr(0, pos+4); _zipFile = p.substr(0, pos+4);
// Open file at least once to initialize the virtual file count // Open file at least once to initialize the virtual file count
ZipHandler& zip = open(_zipFile); try
_numFiles = zip.romFiles(); {
myZipHandler->open(_zipFile);
}
catch(const runtime_error&)
{
// TODO: Actually present the error passed in back to the user
// For now, we just indicate that no ROMs were found
_error = ZIPERR_NO_ROMS;
return;
}
_numFiles = myZipHandler->romFiles();
if(_numFiles == 0) if(_numFiles == 0)
{ {
_error = ZIPERR_NO_ROMS; _error = ZIPERR_NO_ROMS;
@ -66,9 +76,9 @@ FilesystemNodeZIP::FilesystemNodeZIP(const string& p)
else if(_numFiles == 1) else if(_numFiles == 1)
{ {
bool found = false; bool found = false;
while(zip.hasNext() && !found) while(myZipHandler->hasNext() && !found)
{ {
const string& file = zip.next(); const string& file = myZipHandler->next();
if(Bankswitch::isValidRomName(file)) if(Bankswitch::isValidRomName(file))
{ {
_virtualPath = file; _virtualPath = file;
@ -136,12 +146,12 @@ bool FilesystemNodeZIP::getChildren(AbstractFSList& myList, ListMode mode,
return false; return false;
std::set<string> dirs; std::set<string> dirs;
ZipHandler& zip = open(_zipFile); myZipHandler->open(_zipFile);
while(zip.hasNext()) while(myZipHandler->hasNext())
{ {
// Only consider entries that start with '_virtualPath' // Only consider entries that start with '_virtualPath'
// Ignore empty filenames and '__MACOSX' virtual directories // Ignore empty filenames and '__MACOSX' virtual directories
const string& next = zip.next(); const string& next = myZipHandler->next();
if(BSPF::startsWithIgnoreCase(next, "__MACOSX") || next == EmptyString) if(BSPF::startsWithIgnoreCase(next, "__MACOSX") || next == EmptyString)
continue; continue;
if(BSPF::startsWithIgnoreCase(next, _virtualPath)) if(BSPF::startsWithIgnoreCase(next, _virtualPath))
@ -177,13 +187,13 @@ uInt32 FilesystemNodeZIP::read(BytePtr& image) const
case ZIPERR_NO_ROMS: throw runtime_error("ZIP file doesn't contain any ROMs"); case ZIPERR_NO_ROMS: throw runtime_error("ZIP file doesn't contain any ROMs");
} }
ZipHandler& zip = open(_zipFile); myZipHandler->open(_zipFile);
bool found = false; bool found = false;
while(zip.hasNext() && !found) while(myZipHandler->hasNext() && !found)
found = zip.next() == _virtualPath; found = myZipHandler->next() == _virtualPath;
return found ? zip.decompress(image) : 0; return found ? myZipHandler->decompress(image) : 0;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

5
src/common/FSNodeZIP.hxx
View File

@ -101,11 +101,6 @@ class FilesystemNodeZIP : public AbstractFSNode
// ZipHandler static reference variable responsible for accessing ZIP files // ZipHandler static reference variable responsible for accessing ZIP files
static unique_ptr<ZipHandler> myZipHandler; static unique_ptr<ZipHandler> myZipHandler;
inline static ZipHandler& open(const string& file)
{
myZipHandler->open(file);
return *myZipHandler;
}
// Get last component of path // Get last component of path
static const char* lastPathComponent(const string& str) static const char* lastPathComponent(const string& str)