From 7df8b1ada4b23acedda5724b492c26a8e322648b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 4 Jun 2014 13:52:37 +0200 Subject: Properly escape bytearray data outside the ascii range when using a codec 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 --- src/corelib/io/qsettings.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/corelib/io') diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 7b4240e102..1748170324 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -696,6 +696,9 @@ void QSettingsPrivate::iniEscapedString(const QString &str, QByteArray &result, { bool needsQuotes = false; bool escapeNextIfDigit = false; + bool useCodec = codec && !str.startsWith(QLatin1String("@ByteArray(")) + && !str.startsWith(QLatin1String("@Variant(")); + int i; int startPos = result.size(); @@ -748,12 +751,12 @@ void QSettingsPrivate::iniEscapedString(const QString &str, QByteArray &result, result += (char)ch; break; default: - if (ch <= 0x1F || (ch >= 0x7F && !codec)) { + if (ch <= 0x1F || (ch >= 0x7F && !useCodec)) { result += "\\x"; result += QByteArray::number(ch, 16); escapeNextIfDigit = true; #ifndef QT_NO_TEXTCODEC - } else if (codec) { + } else if (useCodec) { // slow result += codec->fromUnicode(str.at(i)); #endif -- cgit v1.2.3