[0.63] Have script store return nullptr on facebook::jsi::JSINativeEx…

…ception (#8080) * Have script store return nullptr on facebook::jsi::JSINativeException (#8068) * Return nullptr on facebook::jsi::JSINativeException * Change files * Remove unused exception name * Clean up change files * Change files
microsoft · Jun 22, 2021 · 2803ec0 · 2803ec0
1 parent 3ddd4e2
commit 2803ec0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/change/react-native-windows-2021-06-21-19-27-18-mmap-catchjsiexc-0.63.json b/change/react-native-windows-2021-06-21-19-27-18-mmap-catchjsiexc-0.63.json
@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Have script store return nullptr on facebook::jsi::JSINativeException (#8068)",
+  "packageName": "react-native-windows",
+  "email": "julio.rocha@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2021-06-22T02:27:18.775Z"
+}
diff --git a/vnext/Shared/BaseScriptStoreImpl.cpp b/vnext/Shared/BaseScriptStoreImpl.cpp
@@ -147,7 +147,11 @@ std::unique_ptr<const jsi::Buffer> LocalFileSimpleBufferStore::getBuffer(const s
   }
 
   if (Microsoft::React::GetRuntimeOptionBool("JSI.MemoryMappedScriptStore")) {
-    return Microsoft::JSI::MakeMemoryMappedBuffer(winrt::to_hstring(storeDirectory_ + bufferId).c_str());
+    try {
+      return Microsoft::JSI::MakeMemoryMappedBuffer(winrt::to_hstring(storeDirectory_ + bufferId).c_str());
+    } catch (const facebook::jsi::JSINativeException &) {
+      return nullptr;
+    }
   } else {
     // Treat buffer id as the relative path fragment.
     std::ifstream file(storeDirectory_ + bufferId, std::ios::binary | std::ios::ate);