summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2018-12-01 18:02:52 -0600
committerThiago Macieira <thiago.macieira@intel.com>2018-12-07 18:53:34 +0000
commit962bded90f0ffb7390b4a2a1a5a895156aa5f541 (patch)
tree150c0112739cf6dd540813c7c744d973d6efec6d /src
parent9d4406f49af21a57b6df3ee8f42f682a04bd2edd (diff)
Fix QSettings parsing of spaces after comment lines
[ChangeLog][QtCore][QSettings] Fixed QSettings parsing of blank spaces after comment lines in INI-style configuration files. Fixes: QTBUG-72007 Change-Id: Idd0c85a4e7b64f9c9c7dfffd156c5b219f3b5c0a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qsettings.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index a0de5ac2b1..ab8fd6510a 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -1634,6 +1634,8 @@ bool QConfFileSettingsPrivate::readIniLine(const QByteArray &data, int &dataPos,
char ch;
while (i < dataLen && (((ch = data.at(i)) != '\n') && ch != '\r'))
++i;
+ while (i < dataLen && charTraits[uchar(data.at(i))] & Space)
+ ++i;
lineStart = i;
} else if (!inQuotes) {
--i;