You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rj...@apache.org on 2011/05/10 23:34:43 UTC

svn commit: r1101657 - in /apr/apr-util/branches/1.3.x: CHANGES ldap/apr_ldap_rebind.c

Author: rjung
Date: Tue May 10 21:34:43 2011
New Revision: 1101657

URL: http://svn.apache.org/viewvc?rev=1101657&view=rev
Log:
apr_ldap: Fix crash because of NULL cleanup registered by
apr_ldap_rebind_init().

Backport of r1082171 from trunk.

Modified:
    apr/apr-util/branches/1.3.x/CHANGES
    apr/apr-util/branches/1.3.x/ldap/apr_ldap_rebind.c

Modified: apr/apr-util/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/CHANGES?rev=1101657&r1=1101656&r2=1101657&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.3.x/CHANGES [utf-8] Tue May 10 21:34:43 2011
@@ -1,6 +1,8 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.3.12
 
+  *) apr_ldap: Fix crash because of NULL cleanup registered by
+     apr_ldap_rebind_init().  [Rainer Jung]
 
 Changes with APR-util 1.3.11
 

Modified: apr/apr-util/branches/1.3.x/ldap/apr_ldap_rebind.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/ldap/apr_ldap_rebind.c?rev=1101657&r1=1101656&r2=1101657&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/ldap/apr_ldap_rebind.c (original)
+++ apr/apr-util/branches/1.3.x/ldap/apr_ldap_rebind.c Tue May 10 21:34:43 2011
@@ -82,7 +82,8 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_
 #endif
 
     /* run after apr_thread_mutex_create cleanup */
-    apr_pool_cleanup_register(pool, &apr_ldap_xref_lock, apr_ldap_pool_cleanup_set_null, NULL);
+    apr_pool_cleanup_register(pool, &apr_ldap_xref_lock, apr_ldap_pool_cleanup_set_null,
+                              apr_pool_cleanup_null);
 
 #if APR_HAS_THREADS
     if (apr_ldap_xref_lock == NULL) {