Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed hash collisions in ZIP files (patch 1082026)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-02-19 16:53:49 +00:00
parent f260c476e4
commit 62d9eab60c
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/fs_zip.h
View File

@@ -21,6 +21,10 @@
#include "wx/filesys.h" #include "wx/filesys.h"
#include "wx/hashmap.h" #include "wx/hashmap.h"
WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxZipFSHandler // wxZipFSHandler
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -40,7 +44,7 @@ class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler
class wxZipInputStream *m_Archive; class wxZipInputStream *m_Archive;
wxString m_Pattern, m_BaseDir, m_ZipFile; wxString m_Pattern, m_BaseDir, m_ZipFile;
bool m_AllowDirs, m_AllowFiles; bool m_AllowDirs, m_AllowFiles;
wxLongToLongHashMap *m_DirsFound; wxZipFilenameHashMap *m_DirsFound;
wxString DoFind(); wxString DoFind();
void CloseArchive(class wxZipInputStream *archive); void CloseArchive(class wxZipInputStream *archive);

9
src/common/fs_zip.cpp
View File

@@ -166,7 +166,7 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
if (m_AllowDirs) if (m_AllowDirs)
{ {
delete m_DirsFound; delete m_DirsFound;
m_DirsFound = new wxLongToLongHashMap(); m_DirsFound = new wxZipFilenameHashMap();
} }
return DoFind(); return DoFind();
} }
@@ -205,12 +205,9 @@ wxString wxZipFSHandler::DoFind()
dir = namestr.BeforeLast(wxT('/')); dir = namestr.BeforeLast(wxT('/'));
while (!dir.IsEmpty()) while (!dir.IsEmpty())
{ {
long key = 0; if( m_DirsFound->find(dir) == m_DirsFound->end() )
for (size_t i = 0; i < dir.Length(); i++) key += (wxUChar)dir[i];
wxLongToLongHashMap::iterator it = m_DirsFound->find(key);
if (it == m_DirsFound->end())
{ {
(*m_DirsFound)[key] = 1; (*m_DirsFound)[dir] = 1;
filename = dir.AfterLast(wxT('/')); filename = dir.AfterLast(wxT('/'));
dir = dir.BeforeLast(wxT('/')); dir = dir.BeforeLast(wxT('/'));
if (!filename.IsEmpty() && m_BaseDir == dir && if (!filename.IsEmpty() && m_BaseDir == dir &&