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

List:       kde-commits
Subject:    [kdepim-runtime] resources/maildir/libmaildir: Maildir resource: Fix handling of whitespace-only hea
From:       Frank Roscher <Frank-Roscher () gmx ! net>
Date:       2013-07-08 18:54:04
Message-ID: E1UwGZY-0006sW-2i () scm ! kde ! org
[Download RAW message or body]

Git commit 5303aa064c8c8031cd205a0fc2d5817accabd952 by Frank Roscher.
Committed on 08/07/2013 at 18:37.
Pushed by froscher into branch 'master'.

Maildir resource: Fix handling of whitespace-only header lines

Previously, affected mails' headers would be parsed only in part,
resulting in (for example) seemingly empty subject lines.

BUG:
FIXED-IN: 4.11
REVIEW: 111307

M  +1    -1    resources/maildir/libmaildir/maildir.cpp

http://commits.kde.org/kdepim-runtime/5303aa064c8c8031cd205a0fc2d5817accabd952

diff --git a/resources/maildir/libmaildir/maildir.cpp b/resources/maildir/libmaildir/maildir.cpp
index 771400e..1fa70c3 100644
--- a/resources/maildir/libmaildir/maildir.cpp
+++ b/resources/maildir/libmaildir/maildir.cpp
@@ -513,7 +513,7 @@ QByteArray Maildir::readEntryHeadersFromFile( const QString& file ) const
     f.map( 0, qMin( (qint64)8000, f.size() ) );
     forever {
         QByteArray line = f.readLine();
-        if ( line.trimmed().isEmpty() )
+        if ( line.isEmpty() || line.startsWith('\n') )
             break;
         result.append( line );
     }

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