diff options
Diffstat (limited to 'kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff')
| -rw-r--r-- | kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff b/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff new file mode 100644 index 00000000000..a3092f05876 --- /dev/null +++ b/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff @@ -0,0 +1,22 @@ +diff -u libkdepim/addresseelineedit.cpp libkdepim/addresseelineedit.cpp +--- libkdepim/addresseelineedit.cpp (revision 1019119) ++++ libkdepim/addresseelineedit.cpp (revision 1019358) +@@ -800,7 +800,7 @@ + + void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs ) + { +- if ( s_LDAPLineEdit != this ) { ++ if ( adrs.isEmpty() || s_LDAPLineEdit != this ) { + return; + } + +@@ -817,7 +817,8 @@ + setText( m_previousAddresses + m_searchString ); + // only complete again if the user didn't change the selection while + // we were waiting; otherwise the completion box will be closed +- if ( m_searchString.trimmed() != completionBox()->currentItem()->text().trimmed() ) { ++ QListWidgetItem *current = completionBox()->currentItem(); ++ if ( !current || m_searchString.trimmed() != current->text().trimmed() ) { + doCompletion( m_lastSearchMode ); + } + } |