AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly escape bytearray data outside the ascii range when using a codec

Browse Source 
Some codecs can't handle the range outside ascii properly and would then
fail to read the data back in correctly.

Task-number: QTBUG-15543
Change-Id: I4c02921e787a939eeec0c7a11603b5896d756aef
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Lars Knoll 2014-06-04 13:52:37 +02:00 committed by The Qt Project
parent a149d2f73e
commit 7df8b1ada4
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -696,6 +696,9 @@ void QSettingsPrivate::iniEscapedString(const QString &str, QByteArray &result,
{ {
bool needsQuotes = false; bool needsQuotes = false;
bool escapeNextIfDigit = false; bool escapeNextIfDigit = false;
bool useCodec = codec && !str.startsWith(QLatin1String("@ByteArray("))
&& !str.startsWith(QLatin1String("@Variant("));
int i; int i;
int startPos = result.size(); int startPos = result.size();
@ -748,12 +751,12 @@ void QSettingsPrivate::iniEscapedString(const QString &str, QByteArray &result,
result += (char)ch; result += (char)ch;
break; break;
default: default:
if (ch <= 0x1F || (ch >= 0x7F && !codec)) { if (ch <= 0x1F || (ch >= 0x7F && !useCodec)) {
result += "\\x"; result += "\\x";
result += QByteArray::number(ch, 16); result += QByteArray::number(ch, 16);
escapeNextIfDigit = true; escapeNextIfDigit = true;
#ifndef QT_NO_TEXTCODEC #ifndef QT_NO_TEXTCODEC
} else if (codec) { } else if (useCodec) {
// slow // slow
result += codec->fromUnicode(str.at(i)); result += codec->fromUnicode(str.at(i));
#endif #endif

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

@ -166,6 +166,7 @@ private slots:
void testByteArray_data(); void testByteArray_data();
void testByteArray(); void testByteArray();
void iniCodec();
private: private:
const bool m_canWriteNativeSystemSettings; const bool m_canWriteNativeSystemSettings;
@ -695,6 +696,28 @@ void tst_QSettings::testByteArray()
} }
} }
void tst_QSettings::iniCodec()
{
{
QSettings settings("QtProject", "tst_qsettings");
settings.setIniCodec("cp1251");
QByteArray ba;
ba.resize(256);
for (int i = 0; i < ba.size(); i++)
ba[i] = i;
settings.setValue("array",ba);
}
{
QSettings settings("QtProject", "tst_qsettings");
settings.setIniCodec("cp1251");
QByteArray ba = settings.value("array").toByteArray();
QCOMPARE(ba.size(), 256);
for (int i = 0; i < ba.size(); i++)
QCOMPARE((uchar)ba.at(i), (uchar)i);
}
}
void tst_QSettings::testErrorHandling_data() void tst_QSettings::testErrorHandling_data()
{ {
QTest::addColumn<int>("filePerms"); // -1 means file should not exist QTest::addColumn<int>("filePerms"); // -1 means file should not exist