fixing overrelease and out-of-bounds write, fixes #13725

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

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 9f3551a742afdcc9202e408e760a6b50dfa1ab87..9339de6720dd1b00820f42313474a428658c7805 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -20,7 +20,7 @@
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_INET
 
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_INET
 

-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP

     #include "wx/module.h"
 #endif
 
     #include "wx/module.h"
 #endif
 


@@ -107,7 +107,6 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
     {
         wxInputStream *s = url.GetInputStream();
         wxString content = url.GetProtocol().GetContentType();
     {
         wxInputStream *s = url.GetInputStream();
         wxString content = url.GetProtocol().GetContentType();

-        if (content == wxEmptyString) content = GetMimeTypeFromExt(location);

         if (s)
         {
             wxString tmpfile =
         if (s)
         {
             wxString tmpfile =


@@ -130,7 +129,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
         }
     }
 
         }
     }
 

-    return (wxFSFile*) NULL; // incorrect URL
+    return NULL; // incorrect URL

 #endif
 }
 
 #endif
 }
 


@@ -140,12 +139,26 @@ class wxFileSystemInternetModule : public wxModule
     DECLARE_DYNAMIC_CLASS(wxFileSystemInternetModule)
 
     public:
     DECLARE_DYNAMIC_CLASS(wxFileSystemInternetModule)
 
     public:

+        wxFileSystemInternetModule() :
+           wxModule(),
+           m_handler(NULL)
+        {
+        }
+

         virtual bool OnInit()
         {
         virtual bool OnInit()
         {

-            wxFileSystem::AddHandler(new wxInternetFSHandler);
+            m_handler = new wxInternetFSHandler;
+            wxFileSystem::AddHandler(m_handler);

             return true;
         }
             return true;
         }

-        virtual void OnExit() {}
+
+        virtual void OnExit()
+        {
+            delete wxFileSystem::RemoveHandler(m_handler);
+        }
+
+    private:
+        wxFileSystemHandler* m_handler;

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)