Make normalizedInstallationPathForHost also normalize Unicode

sparkle-project · Jan 27, 2017 · 0a869e8 · 0a869e8
1 parent 14c543c
commit 0a869e8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Sparkle/SUInstaller.m b/Sparkle/SUInstaller.m
@@ -154,8 +154,10 @@ + (NSString *)normalizedInstallationPathForHost:(SUHost *)host
     assert(bundle != nil);
 
     NSString *normalizedAppPath = [[[bundle bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", [host objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleNameKey], [[bundle bundlePath] pathExtension]]];
-
-    return normalizedAppPath;
+
+    // Roundtrip string through fileSystemRepresentation to ensure it uses filesystem's Unicode normalization
+    // rather than arbitrary Unicode form from Info.plist - #1017
+    return [NSString stringWithUTF8String:[normalizedAppPath fileSystemRepresentation]];
 }
 
 @end