2007-08-22 [wwp] 2.10.0cvs151

	* src/ldapquery.c
		Few better null-ptr checks.

diff --git a/ChangeLog b/ChangeLog
index f8f30358f862a8b10463dfa54f5277b1dfb69996..b0172d674e5ade82cac75aa8e094f5275d67161f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-22 [wwp]       2.10.0cvs151
+
+       * src/ldapquery.c
+               Few better null-ptr checks.
+
 2007-08-22 [colin]     2.10.0cvs150
 
        * src/editldap.c

diff --git a/PATCHSETS b/PATCHSETS
index a97615661f7dfcccb6549098f0c2fd80e4ea63ba..bac8cf56fbf0fd96549c94ee4261838ce215db61 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2805,3 +2805,4 @@
 ( cvs diff -u -r 1.3.2.23 -r 1.3.2.24 src/ldapquery.c;  ) > 2.10.0cvs148.patchset
 ( cvs diff -u -r 1.3.2.24 -r 1.3.2.25 src/ldapquery.c;  ) > 2.10.0cvs149.patchset
 ( cvs diff -u -r 1.8.2.28 -r 1.8.2.29 src/editldap.c;  cvs diff -u -r 1.10.2.12 -r 1.10.2.13 src/editldap_basedn.c;  cvs diff -u -r 1.3.2.25 -r 1.3.2.26 src/ldapquery.c;  cvs diff -u -r 1.4.2.14 -r 1.4.2.15 src/ldapserver.c;  cvs diff -u -r 1.2.2.9 -r 1.2.2.10 src/ldapserver.h;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/ldapupdate.c;  cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/ldaputil.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/ldaputil.h;  ) > 2.10.0cvs150.patchset
+( cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/ldapquery.c;  ) > 2.10.0cvs151.patchset

diff --git a/configure.ac b/configure.ac
index f7e6b7d0763f87c24116b5aa9cddb7d3654933b9..0e2a551ffe100f98b37e572df77c509c84586051 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=150
+EXTRA_VERSION=151
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/ldapquery.c b/src/ldapquery.c
index ff5582649addb916ea493e40145268bc0f43d145..1da82a4cb2f63c7860848891a9a444cce61d0638 100644 (file)
--- a/src/ldapquery.c
+++ b/src/ldapquery.c
@@ -115,8 +115,9 @@ void ldapqry_set_control( LdapQuery *qry, LdapControl *ctl ) {
  */
 void ldapqry_set_name( LdapQuery* qry, const gchar *value ) {
        g_return_if_fail( qry != NULL );
-       g_return_if_fail( ADDRQUERY_OBJECT(qry) != NULL );
        ADDRQUERY_NAME(qry) = mgu_replace_string( ADDRQUERY_NAME(qry), value );
+       if (ADDRQUERY_NAME(qry) == NULL)
+               return;
        g_strstrip( ADDRQUERY_NAME(qry) );
        debug_print("set name: %s\n", ADDRQUERY_NAME(qry));
 }
@@ -128,8 +129,9 @@ void ldapqry_set_name( LdapQuery* qry, const gchar *value ) {
  */
 void ldapqry_set_search_value( LdapQuery *qry, const gchar *value ) {
        g_return_if_fail( qry != NULL );
-       g_return_if_fail( ADDRQUERY_OBJECT(qry) != NULL );
        ADDRQUERY_SEARCHVALUE(qry) = mgu_replace_string( ADDRQUERY_SEARCHVALUE(qry), value );
+       if (ADDRQUERY_SEARCHVALUE(qry) == NULL)
+               return;
        g_strstrip( ADDRQUERY_SEARCHVALUE(qry) );
        debug_print("search value: %s\n", ADDRQUERY_SEARCHVALUE(qry));
 }
@@ -157,7 +159,6 @@ void ldapqry_set_query_type( LdapQuery* qry, const gint value ) {
  */
 void ldapqry_set_search_type( LdapQuery *qry, const AddrSearchType value ) {
        g_return_if_fail( qry != NULL );
-       g_return_if_fail( ADDRQUERY_OBJECT(qry) != NULL );
        ADDRQUERY_SEARCHTYPE(qry) = value;
 }
 
@@ -168,7 +169,6 @@ void ldapqry_set_search_type( LdapQuery *qry, const AddrSearchType value ) {
  */
 void ldapqry_set_query_id( LdapQuery* qry, const gint value ) {
        g_return_if_fail( qry != NULL );
-       g_return_if_fail( ADDRQUERY_OBJECT(qry) != NULL );
        ADDRQUERY_ID(qry) = value;
 }
 
@@ -1035,7 +1035,8 @@ static void ldapqry_destroyer( void * ptr ) {
 void ldapqry_cancel( LdapQuery *qry ) {
        g_return_if_fail( qry != NULL );
 
-       debug_print("cancelling::%d::%s\n", (int) pthread_self(), ADDRQUERY_NAME(qry));
+       debug_print("cancelling::%d::%s\n", (int) pthread_self(),
+                       ADDRQUERY_NAME(qry)?ADDRQUERY_NAME(qry):"null");
        if( ldapqry_get_busy_flag( qry ) ) {
                if( qry->thread ) {
                        debug_print("calling pthread_cancel\n");