[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepimlibs
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-09-09 14:49:36
Message-ID: 1252507776.205196.14189.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1021578 by tmcguire:

Merged revisions 1021325 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs

........
  r1021325 | mkoller | 2009-09-08 23:05:24 +0200 (Tue, 08 Sep 2009) | 7 lines
  
  Backport r1021324 by mkoller from trunk to the 4.3 branch:
  
  CCBUG: 206417
  
  Be more tolerant and decode illegal chars in the given encoding
........


 _M            . (directory)  
 M  +2 -1      kmime/kmime_codec_qp.cpp  
 M  +4 -4      kmime/kmime_header_parsing.cpp  


** branches/kdepim/enterprise4/kdepimlibs #property svnmerge-integrated
   - /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575,990631,990684,991932,9 \
96755,997101,997490,998251,1000615,1007460,1008037,1008812,1009437,1011841,1013328-1013331,1013810,1015198,1015975-1016224,1016226-1016229,1019800
  + /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575,990631,990684,991932,99 \
6755,997101,997490,998251,1000615,1007460,1008037,1008812,1009437,1011841,1013328-1013331,1013810,1015198,1015975-1016224,1016226-1016229,1019800,1021325
                
--- branches/kdepim/enterprise4/kdepimlibs/kmime/kmime_codec_qp.cpp #1021577:1021578
@@ -419,7 +419,8 @@
         mExpectLF = true;
       } else {
         kWarning() << "QuotedPrintableDecoder:" << ch <<
-          "illegal character in input stream! Ignoring.";
+          "illegal character in input stream!";
+        *dcursor++ = char( ch );
       }
     }
   }
--- branches/kdepim/enterprise4/kdepimlibs/kmime/kmime_header_parsing.cpp \
#1021577:1021578 @@ -361,20 +361,20 @@
   int encodedTextLength = encodedTextEnd - encodedTextStart;
   QByteArray buffer;
   buffer.resize( codec->maxDecodedSizeFor( encodedTextLength ) );
-  QByteArray::Iterator bit = buffer.begin();
-  QByteArray::ConstIterator bend = buffer.end();
+  char *bbegin = buffer.data();
+  char *bend = bbegin + buffer.length();
 
   //
   // STEP 5:
   // do the actual decoding
   //
 
-  if ( !dec->decode( encodedTextStart, encodedTextEnd, bit, bend ) ) {
+  if ( !dec->decode( encodedTextStart, encodedTextEnd, bbegin, bend ) ) {
     KMIME_WARN << codec->name() << "codec lies about its maxDecodedSizeFor("
                << encodedTextLength << ")\nresult may be truncated";
   }
 
-  result = textCodec->toUnicode( buffer.begin(), bit - buffer.begin() );
+  result = textCodec->toUnicode( buffer.data(), bbegin - buffer.data() );
 
   kDebug(5320) << "result now: \"" << result << "\"";
   // cleanup:


[prev in list] [next in list] [prev in thread] [next in thread]