Changeset 229 for trunk/src/corelib

Timestamp:

Oct 16, 2009, 1:19:40 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QSettings [Win, OS/2]: When setting and then getting string or binary data, a destructive Latin1 -> QString -> Local8Bit -> QString -> Latin1 conversion could be performed replacing characters >0x7F with '?' in the stream. As a result, saving e.g. a QDateTime object and then reading it could construct a completely different one [nasty vendor bug].

Location:

trunk/src/corelib/io

Files:

• qsettings_os2.cpp (modified) (9 diffs)
• qsettings_win.cpp (modified) (10 diffs)

trunk/src/corelib/io/qsettings_os2.cpp

@@ -677 +677 @@
     }
 
+
+
+
+
+
+
+
+
     switch (dataType) {
         case REG_EXPAND_SZ:
@@ -685 +693 @@
                     s = QString::fromUtf16(((const ushort*)data.constData()));
                 }, {
-                    s = QString::fromLocal8Bit(data.constData());
+                    s = QString::fromL(data.constData());
                 } );
             }
@@ -723 +731 @@
                     s = QString::fromUtf16((const ushort*)data.constData(), data.size()/2);
                 }, {
-                    s = QString::fromLocal8Bit(data.constData(), data.size());
+                    s = QString::fromL(data.constData(), data.size());
                 } );
             }
@@ -876 +884 @@
     QByteArray regValueBuff;
 
+
+
+
+
+
+
+
+
     // Determine the type
     switch (value.type()) {
@@ -897 +913 @@
                     regValueBuff = QByteArray((const char*)s.utf16(), s.length()*2);
                 }, {
-                    regValueBuff = QByteArray((const char*)s.toLocal8Bit(), s.length());
+                    regValueBuff = QByteArray((const char*)s.toL(), s.length());
                 } );
             } else {
@@ -906 +922 @@
                         regValueBuff += QByteArray((const char*)s.utf16(), (s.length() + 1)*2);
                     }, {
-                        regValueBuff += QByteArray((const char*)s.toLocal8Bit(), s.length() + 1);
+                        regValueBuff += QByteArray((const char*)s.toL(), s.length() + 1);
                     } );
                 }
@@ -926 +942 @@
         }
 
-        case QVariant::ByteArray:
-            // fallthrough intended
-
         default: {
             // If the string does not contain '\0', we can use REG_SZ, the native registry
@@ -938 +951 @@
                     regValueBuff = QByteArray((const char*)s.utf16(), s.length()*2);
                 }, {
-                    regValueBuff = QByteArray((const char*)s.toLocal8Bit(), s.length());
+                    regValueBuff = QByteArray((const char*)s.toL(), s.length());
                 } );
             } else {
@@ -944 +957 @@
                     regValueBuff = QByteArray((const char*)s.utf16(), (s.length() + 1)*2);
                 }, {
-                    regValueBuff = QByteArray((const char*)s.toLocal8Bit(), s.length() + 1);
+                    regValueBuff = QByteArray((const char*)s.toL(), s.length() + 1);
                 } );
             }

trunk/src/corelib/io/qsettings_win.cpp

@@ -545 +545 @@
     }
 
+
+
+
+
+
+
+
+
     switch (dataType) {
         case REG_EXPAND_SZ: