From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 19 Sep 2003 00:01:08 +0000 (+0000)
Subject: check whether input stream is readable in OpenFile() (patch 808941)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3e5175b73735578d71d3d8785c1fb011bcc48405

check whether input stream is readable in OpenFile() (patch 808941)


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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 648130d001..6892ca1ecf 100644
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -186,7 +186,16 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
     if (!wxFileExists(fullpath))
         return (wxFSFile*) NULL;
 
-    return new wxFSFile(new wxFFileInputStream(fullpath),
+    // we need to check whether we can really read from this file, otherwise
+    // wxFSFile is not going to work
+    wxFFileInputStream *is = new wxFFileInputStream(fullpath);
+    if ( !is->Ok() )
+    {
+        delete is;
+        return (wxFSFile*) NULL;
+    }
+
+    return new wxFSFile(is,
                         right,
                         GetMimeTypeFromExt(location),
                         GetAnchor(location)