2010-12-18 [mones] 3.7.8cvs9

	* src/ldaputil.c
		Fix crash when searching or adding a LDAP server

diff --git a/ChangeLog b/ChangeLog
index f9dad10a76984a07978a3ae7c66f4ae66678108b..34c68cd1592c0f7e63023ab25a792d44086d1f9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-18 [mones]     3.7.8cvs9
+
+       * src/ldaputil.c
+               Fix crash when searching or adding a LDAP server
+
 2010-12-17 [colin]     3.7.8cvs8
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index 450f3692227eef01cea6b34e820c9633d7623f1f..cbb52aa4178980d888baf83bcf894cd5ae6177b7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4082,3 +4082,4 @@
 ( cvs diff -u -r 1.9.2.30 -r 1.9.2.31 src/addressadd.c;  cvs diff -u -r 1.60.2.138 -r 1.60.2.139 src/addressbook.c;  cvs diff -u -r 1.28.2.45 -r 1.28.2.46 src/addrindex.c;  cvs diff -u -r 1.3.2.35 -r 1.3.2.36 src/ldapquery.c;  cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/ldapquery.h;  cvs diff -u -r 1.4.2.19 -r 1.4.2.20 src/ldapserver.c;  cvs diff -u -r 1.2.2.12 -r 1.2.2.13 src/ldapserver.h;  cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/ldapupdate.c;  cvs diff -u -r 1.1.4.17 -r 1.1.4.18 src/ldaputil.c;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/ldaputil.h;  ) > 3.7.8cvs6.patchset
 ( cvs diff -u -r 1.213.2.197 -r 1.213.2.198 src/folder.c;  ) > 3.7.8cvs7.patchset
 ( cvs diff -u -r 1.654.2.4156 -r 1.654.2.4157 configure.ac;  cvs diff -u -r 1.8.2.38 -r 1.8.2.39 src/editldap.c;  cvs diff -u -r 1.3.2.36 -r 1.3.2.37 src/ldapquery.c;  cvs diff -u -r 1.4.2.20 -r 1.4.2.21 src/ldapserver.c;  cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/ldapupdate.c;  cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/ldaputil.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/ldaputil.h;  ) > 3.7.8cvs8.patchset
+( cvs diff -u -r 1.1.4.19 -r 1.1.4.20 src/ldaputil.c;  ) > 3.7.8cvs9.patchset

diff --git a/configure.ac b/configure.ac
index 99195c427db7a0b577b3a9b34f5caa8fc1b990e8..111da608b6c8a56e3b00e7d0daf638901d2d024e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=8
+EXTRA_VERSION=9
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/ldaputil.c b/src/ldaputil.c
index ccaff9f64c217b3da9a7859e4bc24b3398a28a03..3385d22ec5238af6c2734cf049ccb1f60cac1fb4 100644 (file)
--- a/src/ldaputil.c
+++ b/src/ldaputil.c
@@ -315,7 +315,7 @@ gboolean ldaputil_test_ldap_lib( void ) {
 
 const gchar *ldaputil_get_error(LDAP *ld)
 {
-       gchar *ld_error;
+       gchar *ld_error = NULL;
        static gchar error[512];
 
        ldap_get_option( ld, LDAP_OPT_ERROR_STRING, &ld_error);