Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

1 files changed, 4 insertions, 2 deletions

diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp
index 1bf76ea..188ac8c 100644
--- a/src/corelib/codecs/qiconvcodec.cpp
+++ b/src/corelib/codecs/qiconvcodec.cpp
@@ -225,10 +225,11 @@ QString QIconvCodec::convertToUnicode(const char* chars, int len, ConverterState
     char *inBytes = const_cast<char *>(chars);
 #endif
 
+    QByteArray in;
     if (remainingCount) {
         // we have to prepend the remaining bytes from the previous conversion
         inBytesLeft += remainingCount;
-        QByteArray in(inBytesLeft, Qt::Uninitialized);
+        in.resize(inBytesLeft);
         inBytes = in.data();
 
         memcpy(in.data(), remainingBuffer, remainingCount);
@@ -362,9 +363,10 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt
     inBytes = const_cast<char *>(reinterpret_cast<const char *>(uc));
     inBytesLeft = len * sizeof(QChar);
 
+    QByteArray in;
     if (convState && convState->remainingChars) {
         // we have one surrogate char to be prepended
-        QByteArray in(sizeof(QChar) + len, Qt::Uninitialized);
+        in.resize(sizeof(QChar) + len);
         inBytes = in.data();
 
         QChar remaining = convState->state_data[0];