check that the pointer is non-NULL before using it in OpenFile() (thanks coverity)

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

diff --git a/src/common/fs_arc.cpp b/src/common/fs_arc.cpp
index a00e6accd7a13f68be036ae2af134b50003bba92..83092fe39262caf1455118a5e986493075145643 100644 (file)
--- a/src/common/fs_arc.cpp
+++ b/src/common/fs_arc.cpp
@@ -395,27 +395,30 @@ wxFSFile* wxArchiveFSHandler::OpenFile(
     }
 
     wxArchiveInputStream *s = factory->NewStream(leftStream);
     }
 
     wxArchiveInputStream *s = factory->NewStream(leftStream);

+    if ( !s )
+        return NULL;
+

     s->OpenEntry(*entry);
 
     s->OpenEntry(*entry);
 

-    if (s && s->IsOk())
+    if (!s->IsOk())

     {
     {

+        delete s;
+        return NULL;
+    }
+

 #if WXWIN_COMPATIBILITY_2_6
 #if WXWIN_COMPATIBILITY_2_6

-        if (factory->IsKindOf(CLASSINFO(wxZipClassFactory)))
-            ((wxZipInputStream*)s)->m_allowSeeking = true;
+    if (factory->IsKindOf(CLASSINFO(wxZipClassFactory)))
+        ((wxZipInputStream*)s)->m_allowSeeking = true;

 #endif // WXWIN_COMPATIBILITY_2_6
 
 #endif // WXWIN_COMPATIBILITY_2_6
 

-        return new wxFSFile(s,
-                            key + right,
-                            GetMimeTypeFromExt(location),
-                            GetAnchor(location)
+    return new wxFSFile(s,
+                        key + right,
+                        GetMimeTypeFromExt(location),
+                        GetAnchor(location)

 #if wxUSE_DATETIME
 #if wxUSE_DATETIME

-                            , entry->GetDateTime()
+                        , entry->GetDateTime()

 #endif // wxUSE_DATETIME
 #endif // wxUSE_DATETIME

-                            );
-    }
-
-    delete s;
-    return NULL;
+                        );

 }
 
 wxString wxArchiveFSHandler::FindFirst(const wxString& spec, int flags)
 }
 
 wxString wxArchiveFSHandler::FindFirst(const wxString& spec, int flags)