yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix loading xcursor themes with invalid Inherits field

Browse source 
Xcursor loading can get stuck in an infinite recursion if index.theme
file indicates that the theme inherits itself.

In order to prevent that, keep track of the loaded so far themes and
avoid loading already loaded themes.

BUG: 457926
This commit is contained in:
Vlad Zahorodnii 2022-08-31 11:37:04 +03:00
parent 245eb822c7
commit 2d2f972bff
1 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/xcursortheme.cpp
View file

@ -12,7 +12,9 @@
#include <QDir>
#include <QFile>
#include <QSet>
#include <QSharedData>
#include <QStack>
#include <QStandardPaths>
namespace KWin
@ -157,22 +159,36 @@ static QStringList searchPaths()
void KXcursorThemePrivate::load(const QString &themeName, int size, qreal devicePixelRatio)
{
const QStringList paths = searchPaths();
QStringList inherits;
for (const QString &path : paths) {
const QDir dir(path + QLatin1Char('/') + themeName);
if (!dir.exists()) {
QStack<QString> stack;
QSet<QString> loaded;
stack.push(themeName);
while (!stack.isEmpty()) {
const QString themeName = stack.pop();
if (loaded.contains(themeName)) {
continue;
}
loadCursors(dir.filePath(QStringLiteral("cursors")), size, devicePixelRatio);
if (inherits.isEmpty()) {
const KConfig config(dir.filePath(QStringLiteral("index.theme")), KConfig::NoGlobals);
inherits << KConfigGroup(&config, "Icon Theme").readEntry("Inherits", QStringList());
}
}
for (const QString &inherit : inherits) {
load(inherit, size, devicePixelRatio);
QStringList inherits;
for (const QString &path : paths) {
const QDir dir(path + QLatin1Char('/') + themeName);
if (!dir.exists()) {
continue;
}
loadCursors(dir.filePath(QStringLiteral("cursors")), size, devicePixelRatio);
if (inherits.isEmpty()) {
const KConfig config(dir.filePath(QStringLiteral("index.theme")), KConfig::NoGlobals);
inherits << KConfigGroup(&config, "Icon Theme").readEntry("Inherits", QStringList());
}
}
loaded.insert(themeName);
for (auto it = inherits.crbegin(); it != inherits.crend(); ++it) {
stack.push(*it);
}
}
}