Merge pull request #4957 from xavi-b/master

Fix MacOS UTF-8 normalization issue
nextcloud · Apr 24, 2023 · 4429635 · 4429635
2 parents e57fd7d + 5113802
commit 4429635
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp
@@ -882,10 +882,15 @@ QVector<QByteArray> SyncJournalDb::tableColumns(const QByteArray &table)
 
 qint64 SyncJournalDb::getPHash(const QByteArray &file)
 {
+    QByteArray bytes = file;
+#ifdef Q_OS_MAC
+    bytes = QString::fromUtf8(file).normalized(QString::NormalizationForm_C).toUtf8();
+#endif
+
     qint64 h = 0;
-    int len = file.length();
+    int len = bytes.length();
 
-    h = c_jhash64((uint8_t *)file.data(), len, 0);
+    h = c_jhash64((uint8_t *)bytes.data(), len, 0);
     return h;
 }