don't crash when loading images with verbose==false (patch 1449823)

[wxWidgets.git] / src / common / fs_zip.cpp

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index 9f4007213367b5b25e9eb818929cca707c367b06..eefa93f96af4aa7723c2c3a963b003946f0e54f4 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -7,12 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "fs_zip.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -71,13 +65,17 @@ wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
 
 wxZipFSHandler::~wxZipFSHandler()
 {
 
 wxZipFSHandler::~wxZipFSHandler()
 {

-    if (m_Archive)
-        delete m_Archive;
-    if (m_DirsFound)
-        delete m_DirsFound;
+    Cleanup();

 }
 
 
 }
 
 

+void wxZipFSHandler::Cleanup()
+{
+    wxDELETE(m_Archive);
+    wxDELETE(m_DirsFound);
+}
+ 
+

 
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {
 
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {


@@ -86,7 +84,7 @@ bool wxZipFSHandler::CanOpen(const wxString& location)
 }
 
 
 }
 
 

-wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& fs, const wxString& location)
+wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)

 {
     wxString right = GetRightLocation(location);
     wxString left = GetLeftLocation(location);
 {
     wxString right = GetRightLocation(location);
     wxString left = GetLeftLocation(location);


@@ -102,16 +100,20 @@ wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& fs, const wxString& location)
 
     if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
 
 
     if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
 

-    wxFSFile *leftFile = fs.OpenFile(left);
+    // a new wxFileSystem object is needed here to avoid infinite recursion
+    wxFSFile *leftFile = wxFileSystem().OpenFile(left);

     if (!leftFile)
        return NULL;
 
     s = new wxZipFSInputStream(leftFile);
     if (s && s->IsOk())
     {
     if (!leftFile)
        return NULL;
 
     s = new wxZipFSInputStream(leftFile);
     if (s && s->IsOk())
     {

-       wxZipEntry *ent;

        bool found = false;
        bool found = false;

-       while (!found && (ent = s->GetNextEntry())) {
+       while (!found)
+       {
+           wxZipEntry *ent = s->GetNextEntry();
+           if (!ent)
+               break;

            if (ent->GetInternalName() == right)
                found = true;
            delete ent;
            if (ent->GetInternalName() == right)
                found = true;
            delete ent;


@@ -138,7 +140,7 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
     wxString right = GetRightLocation(spec);
     wxString left = GetLeftLocation(spec);
 
     wxString right = GetRightLocation(spec);
     wxString left = GetLeftLocation(spec);
 

-    if (right.Last() == wxT('/')) right.RemoveLast();
+    if (!right.empty() && right.Last() == wxT('/')) right.RemoveLast();

 
     if (m_Archive)
     {
 
     if (m_Archive)
     {


@@ -164,6 +166,8 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
 
     m_Pattern = right.AfterLast(wxT('/'));
     m_BaseDir = right.BeforeLast(wxT('/'));
 
     m_Pattern = right.AfterLast(wxT('/'));
     m_BaseDir = right.BeforeLast(wxT('/'));

+    if (m_BaseDir.StartsWith(wxT("/")))
+        m_BaseDir = m_BaseDir.Mid(1);

 
     if (m_Archive)
     {
 
     if (m_Archive)
     {


@@ -171,6 +175,8 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
         {
             delete m_DirsFound;
             m_DirsFound = new wxZipFilenameHashMap();
         {
             delete m_DirsFound;
             m_DirsFound = new wxZipFilenameHashMap();

+            if (right.empty())  // allow "/" to match the archive root
+                return spec;

         }
         return DoFind();
     }
         }
         return DoFind();
     }