Skip to content

fix: validate subpath format in dconfig #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
18202781743 merged 1 commit into from
Jan 28, 2026
Merged

fix: validate subpath format in dconfig #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/dconfigfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ inline static bool subpathIsValid(const QString &subpath, const QDir &dir)
if (subpath.isEmpty())
return true;

if (!subpath.startsWith(QLatin1Char('/')))
return false;

const QDir subDir(dir.filePath(subpath.mid(1)));
return subDir.absolutePath().startsWith(dir.absolutePath());
}
Expand Down Expand Up @@ -710,6 +713,7 @@ class Q_DECL_HIDDEN DConfigMetaImpl : public DConfigMeta {
qCWarning(cfLog, "Can't load meta file from local prefix: \"%s\"", qPrintable(localPrefix));
return false;
}
qCDebug(cfLog, "Load meta file: \"%s\"", qPrintable(path));

QScopedPointer<QFile> meta(new QFile(path));

Expand Down
4 changes: 4 additions & 0 deletions tests/ut_dconfigfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,10 @@ TEST_F(ut_DConfigFile, setSubpath) {
DConfigFile config(APP_ID, FILE_NAME);
ASSERT_TRUE(config.load(LocalPrefix));
}
{
DConfigFile config(APP_ID, FILE_NAME, "a/b");
ASSERT_FALSE(config.load(LocalPrefix));
}
{
DConfigFile config(APP_ID, FILE_NAME, "/a/b");
ASSERT_TRUE(config.load(LocalPrefix));
Expand Down