Changeset 287344 in webkit

Timestamp:

Dec 21, 2021, 8:52:39 PM (5 years ago)

Author:

sihui_liu@apple.com

Message:

Use fileURLWithPath instead of URLWithString in WebsiteDataStore::excludeDirectoryFromBackup
​https://bugs.webkit.org/show_bug.cgi?id=234582
rdar://86787798

Reviewed by Simon Fraser.

URLWithString may return nil while fileURLWithPath does not; and fileURLWithPath adds ​file:// to path correctly.

• UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:

(WebKit::WebsiteDataStore::excludeDirectoryFromBackup):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-21  Sihui Liu  <sihui_liu@apple.com>
+
+        Use fileURLWithPath instead of URLWithString in WebsiteDataStore::excludeDirectoryFromBackup
+        https://bugs.webkit.org/show_bug.cgi?id=234582
+        rdar://86787798
+
+        Reviewed by Simon Fraser.
+
+        URLWithString may return nil while fileURLWithPath does not; and fileURLWithPath adds file:// to path correctly.
+
+        * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
+        (WebKit::WebsiteDataStore::excludeDirectoryFromBackup):
+
 2021-12-21  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm

@@ -645 +645 @@
 void WebsiteDataStore::excludeDirectoryFromBackup(const String& directory)
 {
-    NSURL *url = [NSURL URLWithString:(NSString *)directory];
+    NSURL *url = [NSURL fileURLWithPath:(NSString *)directory isDirectory:YES];
     if ([[NSFileManager defaultManager] createDirectoryAtURL:url withIntermediateDirectories:YES attributes:nil error:nullptr])
-        [[NSURL fileURLWithPath:(NSString *)directory isDirectory:YES] setResourceValue:@YES forKey:NSURLIsExcludedFromBackupKey error:nil];
-}
-
-#endif
-
-}
+        [url setResourceValue:@YES forKey:NSURLIsExcludedFromBackupKey error:nil];
+}
+
+#endif
+
+}