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

List:       kde-commits
Subject:    [kdepimlibs/KDE/4.7] kmime: in MailBox::address() rewrite to be a
From:       Allen Winter <winter () kde ! org>
Date:       2011-12-01 0:16:31
Message-ID: 20111201001631.7538DA60B9 () git ! kde ! org
[Download RAW message or body]

Git commit ac60d198c89970f138a704dfd7ff7d89afce485e by Allen Winter.
Committed on 01/12/2011 at 01:11.
Pushed by winterz into branch 'KDE/4.7'.

in MailBox::address() rewrite to be a bit more error tolerant.
might fix the crash in bug 263922

MERGE: 4.7
(cherry picked from commit b2dd6557a457a26fbb071493d88133b66128ebbb)

M  +7    -1    kmime/kmime_header_parsing.cpp

http://commits.kde.org/kdepimlibs/ac60d198c89970f138a704dfd7ff7d89afce485e

diff --git a/kmime/kmime_header_parsing.cpp b/kmime/kmime_header_parsing.cpp
index 4c76be9..72da584 100644
--- a/kmime/kmime_header_parsing.cpp
+++ b/kmime/kmime_header_parsing.cpp
@@ -113,7 +113,13 @@ bool AddrSpec::isEmpty() const
 
 QByteArray Mailbox::address() const
 {
-  return mAddrSpec.asString().toLatin1();
+  QByteArray result;
+  const QString asString = addr_spec_as_string( mAddrSpec, false );
+  if ( !asString.isEmpty() ) {
+    result = asString.toLatin1();
+  }
+  return result;
+  //return mAddrSpec.asString().toLatin1();
 }
 
 AddrSpec Mailbox::addrSpec() const
[prev in list] [next in list] [prev in thread] [next in thread]