Author: svn-role
Date: Fri Dec 14 04:02:58 2012
New Revision: 1421660
URL: http://svn.apache.org/viewvc?rev=1421660&view=rev
Log:
Merge r1421103 from trunk:
* r1421103
Fix segfault with kwallet support.
Justification:
Users may get segfaults when using the kwallet support since the pool
cleanup is setup wrong.
Votes:
+1: breser, rhuijben, danielsh
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_auth_kwallet/kwallet.cpp
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1421103
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1421660&r1=1421659&r2=1421660&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Dec 14 04:02:58 2012
@@ -77,11 +77,3 @@ Veto-blocked changes:
Approved changes:
=================
- * r1421103
- Fix segfault with kwallet support.
- Justification:
- Users may get segfaults when using the kwallet support since the pool
- cleanup is setup wrong.
- Votes:
- +1: breser, rhuijben, danielsh
-
Modified: subversion/branches/1.7.x/subversion/libsvn_auth_kwallet/kwallet.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_auth_kwallet/kwallet.cpp?rev=1421660&r1=1421659&r2=1421660&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_auth_kwallet/kwallet.cpp
(original)
+++ subversion/branches/1.7.x/subversion/libsvn_auth_kwallet/kwallet.cpp Fri
Dec 14 04:02:58 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;
}
