Merge branch 'jb45436' into 'master'

[ssu] Do not accept empty fallback uuid file as deviceUid file. Fixes JB#45436 See merge request mer-core/ssu!26
sailfishos · Apr 9, 2019 · abb5545 · abb5545
2 parents fc5da0c + eccfeb1
commit abb5545
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libssu/ssudeviceinfo.cpp b/libssu/ssudeviceinfo.cpp
@@ -323,7 +323,7 @@ QString SsuDeviceInfo::deviceUid()
 
     foreach (const QString &filename, fallbackFiles) {
         QFile machineId(filename);
-        if (machineId.open(QFile::ReadOnly | QFile::Text)) {
+        if (machineId.open(QFile::ReadOnly | QFile::Text) && machineId.size() > 0) {
             QTextStream in(&machineId);
             return normalizeUid(in.readAll());
         }