Path provider windows crash fix (flutter#3814)

Failures to get a known folder that don't throw Windows exceptions need to return null. Fixes flutter/flutter#80712
fotiDim · Sep 13, 2021 · c4e8235 · c4e8235
1 parent 6c2ba0c
commit c4e8235
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/packages/path_provider/path_provider_windows/CHANGELOG.md b/packages/path_provider/path_provider_windows/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.1
+
+* Fix a crash when a known folder can't be located.
+
 ## 2.0.0
 
 * Migrate to null safety

diff --git a/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_real.dart b/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_real.dart
@@ -88,7 +88,11 @@ class PathProviderWindows extends PathProviderPlatform {
 
   @override
   Future<String?> getApplicationSupportPath() async {
-    final String appDataRoot = await getPath(WindowsKnownFolder.RoamingAppData);
+    final String? appDataRoot =
+        await getPath(WindowsKnownFolder.RoamingAppData);
+    if (appDataRoot == null) {
+      return null;
+    }
     final Directory directory = Directory(
         path.join(appDataRoot, _getApplicationSpecificSubdirectory()));
     // Ensure that the directory exists if possible, since it will on other
@@ -114,7 +118,7 @@ class PathProviderWindows extends PathProviderPlatform {
   ///
   /// folderID is a GUID that represents a specific known folder ID, drawn from
   /// [WindowsKnownFolder].
-  Future<String> getPath(String folderID) {
+  Future<String?> getPath(String folderID) {
     final Pointer<Pointer<Utf16>> pathPtrPtr = calloc<Pointer<Utf16>>();
     final Pointer<GUID> knownFolderID = calloc<GUID>()..ref.setGUID(folderID);
 
@@ -130,6 +134,7 @@ class PathProviderWindows extends PathProviderPlatform {
         if (hr == E_INVALIDARG || hr == E_FAIL) {
           throw WindowsException(hr);
         }
+        return Future<String?>.value(null);
       }
 
       final String path = pathPtrPtr.value.toDartString();

diff --git a/packages/path_provider/path_provider_windows/pubspec.yaml b/packages/path_provider/path_provider_windows/pubspec.yaml
@@ -1,7 +1,7 @@
 name: path_provider_windows
 description: Windows implementation of the path_provider plugin
 homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_windows
-version: 2.0.0
+version: 2.0.1
 
 flutter:
   plugin: