Fix local file loading and crash on loading non-existent file

obsproject · Nov 26, 2021 · c8f3434 · c8f3434
1 parent b1303ba
commit c8f3434
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/browser-scheme.cpp b/browser-scheme.cpp
@@ -54,8 +54,13 @@ BrowserSchemeHandlerFactory::Create(CefRefPtr<CefBrowser> browser,
 	CefRefPtr<CefStreamReader> stream =
 		CefStreamReader::CreateForFile(path);
 #endif
-
-	return new CefStreamResourceHandler(CefGetMimeType(fileExtension),
-					    stream);
+
+    if (stream) {
+        return new CefStreamResourceHandler(CefGetMimeType(fileExtension),
+                            stream);
+    } else {
+        return nullptr;
+    }
+
 }
 #endif
diff --git a/browser-scheme.hpp b/browser-scheme.hpp
@@ -22,7 +22,7 @@
 #include <string>
 #include <fstream>
 
-#if CHROME_VERSION_BUILD >= 3440
+#if CHROME_VERSION_BUILD >= 3440 && CHROME_VERSION_BUILD < 4638
 #define ENABLE_LOCAL_FILE_URL_SCHEME 1
 #else
 #define ENABLE_LOCAL_FILE_URL_SCHEME 0