Author: breser
Date: Thu Dec 13 07:37:28 2012
New Revision: 1421103

URL: http://svn.apache.org/viewvc?rev=1421103&view=rev
Log:
Fix segfault when using kwallet support.

apr_pool_cleanup_register does not accept NULL values for the callbacks.

* subversion/libsvn_auth_kwallet/kwallet.cpp
  (kwallet_password_get,kwallet_password_set): Use apr_pool_cleanup_null
    instead of NULL.

Patch by: Lekensteyn <[email protected]>
(lines wrapped by me)

Modified:
    subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp

Modified: subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp?rev=1421103&r1=1421102&r2=1421103&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp (original)
+++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp Thu Dec 13 
07:37:28 2012
@@ -253,7 +253,8 @@ kwallet_password_get(svn_boolean_t *done
         }
     }
 
-  apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL);
+  apr_pool_cleanup_register(pool, parameters, kwallet_terminate,
+                            apr_pool_cleanup_null);
 
   return SVN_NO_ERROR;
 }
@@ -327,7 +328,8 @@ kwallet_password_set(svn_boolean_t *done
         }
     }
 
-  apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL);
+  apr_pool_cleanup_register(pool, parameters, kwallet_terminate,
+                            apr_pool_cleanup_null);
 
   return SVN_NO_ERROR;
 }


Reply via email to