2007-02-07 [colin] 2.7.2cvs30

	* src/ldapquery.c
		Fix bug 1106, 'Claws crash on exit if LDAPS
		autocompletion was used'

diff --git a/ChangeLog b/ChangeLog
index f8a2b9f0405458ac0ede130f569831ac78f9e045..f6ad176f5813b73cb16b384b0477865f15b05e95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-07 [colin]     2.7.2cvs30
+
+       * src/ldapquery.c
+               Fix bug 1106, 'Claws crash on exit if LDAPS 
+               autocompletion was used'
+

 2007-02-07 [paul]      2.7.2cvs29
 
        * src/folder.c
 2007-02-07 [paul]      2.7.2cvs29
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index 357f9d12178818b3db7c3bba2ab38dc05e8b6946..6f1d1c9def4c02bbe5aea9828b4c181fb43afd95 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2347,3 +2347,4 @@
 ( cvs diff -u -r 1.47.2.38 -r 1.47.2.39 src/procheader.c;  ) > 2.7.2cvs27.patchset
 ( cvs diff -u -r 1.13.2.29 -r 1.13.2.30 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/plugins/clamav/clamav_plugin.h;  cvs diff -u -r 1.9.2.23 -r 1.9.2.24 src/plugins/clamav/clamav_plugin_gtk.c;  ) > 2.7.2cvs28.patchset
 ( cvs diff -u -r 1.213.2.134 -r 1.213.2.135 src/folder.c;  cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/imap_gtk.c;  ) > 2.7.2cvs29.patchset
 ( cvs diff -u -r 1.47.2.38 -r 1.47.2.39 src/procheader.c;  ) > 2.7.2cvs27.patchset
 ( cvs diff -u -r 1.13.2.29 -r 1.13.2.30 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/plugins/clamav/clamav_plugin.h;  cvs diff -u -r 1.9.2.23 -r 1.9.2.24 src/plugins/clamav/clamav_plugin_gtk.c;  ) > 2.7.2cvs28.patchset
 ( cvs diff -u -r 1.213.2.134 -r 1.213.2.135 src/folder.c;  cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/imap_gtk.c;  ) > 2.7.2cvs29.patchset

+( cvs diff -u -r 1.3.2.15 -r 1.3.2.16 src/ldapquery.c;  ) > 2.7.2cvs30.patchset

diff --git a/configure.ac b/configure.ac
index 645a400dc840672eb15a117370f4a5898c74f702..8f1a9de0830b3fefcc4299778fd80248d0967498 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=29
+EXTRA_VERSION=30

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/ldapquery.c b/src/ldapquery.c
index fe58db9cbc07e64c5d65e0113e0e18e674f14126..6316cd173973f8d073e9fa5ac98289b6fba0be8e 100644 (file)
--- a/src/ldapquery.c
+++ b/src/ldapquery.c
@@ -245,6 +245,8 @@ static gboolean ldapqry_get_stop_flag( LdapQuery *qry ) {
  */
 static void ldapqry_set_busy_flag( LdapQuery *qry, const gboolean value ) {
        g_return_if_fail( qry != NULL );
  */
 static void ldapqry_set_busy_flag( LdapQuery *qry, const gboolean value ) {
        g_return_if_fail( qry != NULL );

+       if (qry->mutexBusy == NULL)
+               return; /* exiting, mutex already freed */

 
        pthread_mutex_lock( qry->mutexBusy );
        qry->busyFlag = value;
 
        pthread_mutex_lock( qry->mutexBusy );
        qry->busyFlag = value;