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 26080da98779d71a5534e0583a5ba6b509ebba4d..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
 }
 


@@ -153,7 +152,7 @@ class wxFileSystemInternetModule : public wxModule
             return true;
         }
 
             return true;
         }
 

-        virtual void OnExit() 
+        virtual void OnExit()

         {
             delete wxFileSystem::RemoveHandler(m_handler);
         }
         {
             delete wxFileSystem::RemoveHandler(m_handler);
         }