whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly detect UTF-8 BOM markers in ini files 

If we detect a utf8 BOM mark at the beginning of the .ini
file, skip the marker and set the iniCodec to utf8.

Task-number: QTBUG-23381
Change-Id: I1b37fc4f1638a48e4f3ee71ab165e2989bc592f1
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
bb10
Lars Knoll 2014-09-01 14:26:51 +02:00
parent ad1ec8b57d
commit 38c2e3d104
5 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/io/qsettings.cpp
View File

@ -1637,6 +1637,15 @@ bool QConfFileSettingsPrivate::readIniFile(const QByteArray &data,
int sectionPosition = 0;
bool ok = true;
#ifndef QT_NO_TEXTCODEC
// detect utf8 BOM
const uchar *dd = (const uchar *)data.constData();
if (data.size() >= 3 && dd[0] == 0xef && dd[1] == 0xbb && dd[2] == 0xbf) {
iniCodec = QTextCodec::codecForName("UTF-8");
dataPos = 3;
}
#endif
while (readIniLine(data, dataPos, lineStart, lineLen, equalsPos)) {
char ch = data.at(lineStart);
if (ch == '[') {

2
src/corelib/io/qsettings_p.h
View File

@ -282,7 +282,7 @@ public:
bool isWritable() const;
QString fileName() const;
static bool readIniFile(const QByteArray &data, UnparsedSettingsMap *unparsedIniSections);
bool readIniFile(const QByteArray &data, UnparsedSettingsMap *unparsedIniSections);
static bool readIniSection(const QSettingsKey &section, const QByteArray &data,
ParsedSettingsMap *settingsMap, QTextCodec *codec);
static bool readIniLine(const QByteArray &data, int &dataPos, int &lineStart, int &lineLen,

4
tests/auto/corelib/io/qsettings/bom.ini Normal file
View File

@ -0,0 +1,4 @@
[section1]
foo1=bar1
[section2]
foo2=bar2

17
tests/auto/corelib/io/qsettings/qsettings.qrc
View File

@ -1,9 +1,10 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<file>resourcefile.ini</file>
<file>resourcefile2.ini</file>
<file>resourcefile3.ini</file>
<file>resourcefile4.ini</file>
<file>resourcefile5.ini</file>
</qresource>
<RCC>
<qresource prefix="/">
<file>resourcefile.ini</file>
<file>resourcefile2.ini</file>
<file>resourcefile3.ini</file>
<file>resourcefile4.ini</file>
<file>resourcefile5.ini</file>
<file>bom.ini</file>
</qresource>
</RCC>

10
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
View File

@ -161,6 +161,7 @@ private slots:
void testByteArray_data();
void testByteArray();
void iniCodec();
void bom();
private:
const bool m_canWriteNativeSystemSettings;
@ -730,6 +731,15 @@ void tst_QSettings::iniCodec()
}
void tst_QSettings::bom()
{
QSettings s(":/bom.ini", QSettings::IniFormat);
QStringList allkeys = s.allKeys();
QCOMPARE(allkeys.size(), 2);
QVERIFY(allkeys.contains("section1/foo1"));
QVERIFY(allkeys.contains("section2/foo2"));
}
void tst_QSettings::testErrorHandling_data()
{
QTest::addColumn<int>("filePerms"); // -1 means file should not exist