fixed some crashes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index e78ce297a0ffb5907a39631b6615f4d7ceb953e3..dcce84cc10ad422057bf65d3790923387c76e2ad 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -61,7 +61,7 @@ wxZipFSHandler::~wxZipFSHandler()
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);
-    return (p == wxT("zip") );
+    return (p == wxT("zip"));
 }
 
 
@@ -73,12 +73,15 @@ wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& l
     wxString left = GetLeftLocation(location);
     wxInputStream *s;
 
-    if (GetProtocol(left) != wxT("file")) {
+    if (GetProtocol(left) != wxT("file")) 
+    {
+        wxLogError(_("ZIP handler currently supports only local files!"));
         return NULL;
     }
 
     s = new wxZipInputStream(left, right);
-    if (s && (s -> LastError() == wxStream_NOERROR)) {
+    if (s && (s->LastError() == wxStream_NOERROR)) 
+    {
         return new wxFSFile(s,
                             left + wxT("#zip:") + right,
                             GetMimeTypeFromExt(location),
@@ -99,19 +102,23 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
     
     if (right.Last() == wxT('/')) right.RemoveLast();
 
-    if (m_Archive) {
+    if (m_Archive) 
+    {
         unzClose((unzFile)m_Archive);
         m_Archive = NULL;
     }
 
-    if (GetProtocol(left) != wxT("file")) {
+    if (GetProtocol(left) != wxT("file")) 
         return wxEmptyString;
-    }
 
-    switch (flags) {
-        case wxFILE  : m_AllowDirs = FALSE, m_AllowFiles = TRUE; break;
-        case wxDIR   : m_AllowDirs = TRUE, m_AllowFiles = FALSE; break;
-        default : m_AllowDirs = m_AllowFiles = TRUE; break;
+    switch (flags) 
+    {
+        case wxFILE: 
+            m_AllowDirs = FALSE, m_AllowFiles = TRUE; break;
+        case wxDIR: 
+            m_AllowDirs = TRUE, m_AllowFiles = FALSE; break;
+        default: 
+            m_AllowDirs = m_AllowFiles = TRUE; break;
     }
 
     m_ZipFile = left;
@@ -119,13 +126,16 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
     m_Pattern = right.AfterLast(wxT('/'));
     m_BaseDir = right.BeforeLast(wxT('/'));
 
-    if (m_Archive) {
-        if (unzGoToFirstFile((unzFile)m_Archive) != UNZ_OK) {
+    if (m_Archive) 
+    {
+        if (unzGoToFirstFile((unzFile)m_Archive) != UNZ_OK) 
+        {
             unzClose((unzFile)m_Archive);
             m_Archive = NULL;        
         }
+        else return DoFind();
     }
-    return DoFind();
+    return wxEmptyString;
 }
 
 
@@ -151,7 +161,8 @@ wxString wxZipFSHandler::DoFind()
         unzGetCurrentFileInfo((unzFile)m_Archive, NULL, namebuf, 1024, NULL, 0, NULL, 0);
         for (c = namebuf; *c; c++) if (*c == wxT('\\')) *c = wxT('/');
         fn = namebuf;
-        if (fn.Last() == wxT('/')) {
+        if (fn.Length() > 0 && fn.Last() == wxT('/')) 
+        {
             fn.RemoveLast();
             wasdir = TRUE;
         }
@@ -160,14 +171,16 @@ wxString wxZipFSHandler::DoFind()
         name = fn.AfterLast(wxT('/'));
         dir = fn.BeforeLast(wxT('/'));
 
-        if (dir == m_BaseDir) {
+        if (dir == m_BaseDir) 
+        {
             if (m_AllowFiles && !wasdir && wxMatchWild(m_Pattern, name, FALSE))
                 match = m_ZipFile + wxT("#zip:") + fn;
             if (m_AllowDirs && wasdir && wxMatchWild(m_Pattern, name, FALSE))
                 match = m_ZipFile + wxT("#zip:") + fn;
         }
         
-        if (unzGoToNextFile((unzFile)m_Archive) != UNZ_OK) {
+        if (unzGoToNextFile((unzFile)m_Archive) != UNZ_OK) 
+        {
             unzClose((unzFile)m_Archive);
             m_Archive = NULL;
             break;