Use the same fileSystemRepresentation function for both parts of the …

…path
sparkle-project · Jan 27, 2017 · ed16c5c · ed16c5c
1 parent 0a869e8
commit ed16c5c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Sparkle/SUBinaryDeltaCommon.m b/Sparkle/SUBinaryDeltaCommon.m
@@ -163,6 +163,9 @@ static BOOL _hashOfFileContents(unsigned char* hash, FTSENT *ent)
     CC_SHA1_CTX hashContext;
     CC_SHA1_Init(&hashContext);
 
+    // Ensure the path uses filesystem-specific Unicode normalization #1017
+    NSString *normalizedPath = stringWithFileSystemRepresentation(pathBuffer);
+
     FTSENT *ent = 0;
     while ((ent = fts_read(fts))) {
         if (ent->fts_info != FTS_F && ent->fts_info != FTS_SL && ent->fts_info != FTS_D)
@@ -171,8 +174,8 @@ static BOOL _hashOfFileContents(unsigned char* hash, FTSENT *ent)
         if (ent->fts_info == FTS_D && !MAJOR_VERSION_IS_AT_LEAST(majorVersion, SUBeigeMajorVersion)) {
             continue;
         }
-        
-        NSString *relativePath = pathRelativeToDirectory(path, stringWithFileSystemRepresentation(ent->fts_path));
+
+        NSString *relativePath = pathRelativeToDirectory(normalizedPath, stringWithFileSystemRepresentation(ent->fts_path));
         if (relativePath.length == 0)
             continue;