In rare cases CefStreamReader::CreateForFile returns null - rather th…

…an causing a hard crash, log the error and return NULL
yuanzp · May 8, 2017 · c8d0127 · c8d0127
1 parent 16dbb10
commit c8d0127
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/CefSharp.Core/Internals/ClientAdapter.cpp b/CefSharp.Core/Internals/ClientAdapter.cpp
@@ -704,7 +704,19 @@ namespace CefSharp
             {
                 auto resourceHandler = static_cast<FileResourceHandler^>(handler);
 
-                return new CefStreamResourceHandler(StringUtils::ToNative(resourceHandler->MimeType), CefStreamReader::CreateForFile(StringUtils::ToNative(resourceHandler->FilePath)));
+                auto streamReader = CefStreamReader::CreateForFile(StringUtils::ToNative(resourceHandler->FilePath));
+
+                if (streamReader.get())
+                {
+                    return new CefStreamResourceHandler(StringUtils::ToNative(resourceHandler->MimeType), streamReader);
+                }
+                else
+                {
+                    auto msg = "Unable to load resource CefStreamReader::CreateForFile returned NULL for file:" + resourceHandler->FilePath;
+                    LOG(ERROR) << StringUtils::ToNative(msg).ToString();
+
+                    return NULL;
+                }
             }
             else if (handler->GetType() == ByteArrayResourceHandler::typeid)
             {

diff --git a/CefSharp.Core/SchemeHandlerFactoryWrapper.h b/CefSharp.Core/SchemeHandlerFactoryWrapper.h
@@ -48,7 +48,19 @@ namespace CefSharp
             {
                 auto resourceHandler = static_cast<FileResourceHandler^>(handler);
 
-                return new CefStreamResourceHandler(StringUtils::ToNative(resourceHandler->MimeType), CefStreamReader::CreateForFile(StringUtils::ToNative(resourceHandler->FilePath)));
+                auto streamReader = CefStreamReader::CreateForFile(StringUtils::ToNative(resourceHandler->FilePath));
+
+                if (streamReader.get())
+                {
+                    return new CefStreamResourceHandler(StringUtils::ToNative(resourceHandler->MimeType), streamReader);
+                }
+                else
+                {
+                    auto msg = "Unable to load resource CefStreamReader::CreateForFile returned NULL for file:" + resourceHandler->FilePath;
+                    LOG(ERROR) << StringUtils::ToNative(msg).ToString();
+
+                    return NULL;
+                }
             }
             else if (handler->GetType() == ByteArrayResourceHandler::typeid)
             {