From 6965ab675b778cf63bf61b87794f87078815af79 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Wed, 22 Aug 2007 10:15:05 +0000 Subject: [PATCH] 2007-08-22 [colin] 2.10.0cvs149 * src/ldapquery.c Finish previous fix --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/ldapquery.c | 3 +-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8759d736c..5cabc2fcb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-08-22 [colin] 2.10.0cvs149 + + * src/ldapquery.c + Finish previous fix + 2007-08-22 [colin] 2.10.0cvs148 * src/ldapquery.c diff --git a/PATCHSETS b/PATCHSETS index 0cf67e101..09f57ecbd 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2803,3 +2803,4 @@ ( cvs diff -u -r 1.8.2.27 -r 1.8.2.28 src/editldap.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/ldaputil.c; ) > 2.10.0cvs146.patchset ( cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/ldaputil.c; ) > 2.10.0cvs147.patchset ( 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 diff --git a/configure.ac b/configure.ac index a9acaa542..c52def11a 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=10 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=148 +EXTRA_VERSION=149 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/ldapquery.c b/src/ldapquery.c index 04275e820..9cd6dc264 100644 --- a/src/ldapquery.c +++ b/src/ldapquery.c @@ -1013,10 +1013,9 @@ static void ldapqry_destroyer( void * ptr ) { qry = ( LdapQuery * ) ptr; g_return_if_fail( qry != NULL ); - g_return_if_fail( ADDRQUERY_NAME(qry) != NULL ); debug_print("ldapqry_destroyer::%d::%s\n", (int) pthread_self(), - ADDRQUERY_NAME(qry)); + ADDRQUERY_NAME(qry)?ADDRQUERY_NAME(qry):"null"); /* Perform any destruction here */ if( qry->control != NULL ) { -- 2.25.1