You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2018/01/05 04:00:18 UTC
svn commit: r1820251 - in /subversion/branches/1.10.x: ./ STATUS
subversion/libsvn_subr/object_pool.c
Author: svn-role
Date: Fri Jan 5 04:00:18 2018
New Revision: 1820251
URL: http://svn.apache.org/viewvc?rev=1820251&view=rev
Log:
Merge r1818584 from trunk:
* r1818584
Fix crash when exiting 'svnserve --config-file'.
Justification:
This is a user-reported crash. The underlying container type is now also
part of the authz infrastructure and should be as robust as possible.
Votes:
+1: stefan2, jamessan, brane
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_subr/object_pool.c
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 5 04:00:18 2018
@@ -99,4 +99,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818578,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819162,1819444,1819556-1819557,1819603,1819911
+/subversion/trunk:1817837,1817856,1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819162,1819444,1819556-1819557,1819603,1819911
Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1820251&r1=1820250&r2=1820251&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Jan 5 04:00:18 2018
@@ -29,14 +29,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1818584
- Fix crash when exiting 'svnserve --config-file'.
- Justification:
- This is a user-reported crash. The underlying container type is now also
- part of the authz infrastructure and should be as robust as possible.
- Votes:
- +1: stefan2, jamessan, brane
-
* r1819804
Fix 'shelve' when the current working directory is not the WC root.
Justification:
Modified: subversion/branches/1.10.x/subversion/libsvn_subr/object_pool.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_subr/object_pool.c?rev=1820251&r1=1820250&r2=1820251&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/libsvn_subr/object_pool.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_subr/object_pool.c Fri Jan 5 04:00:18 2018
@@ -172,9 +172,11 @@ add_object_ref(object_ref_t *object_ref,
if (svn_atomic_inc(&object_ref->ref_count) == 0)
svn_atomic_dec(&object_ref->object_pool->unused_count);
- /* make sure the reference gets released automatically */
- apr_pool_cleanup_register(pool, object_ref, object_ref_cleanup,
- apr_pool_cleanup_null);
+ /* Make sure the reference gets released automatically.
+ Since POOL might be a parent pool of OBJECT_REF->OBJECT_POOL,
+ to the reference counting update before destroing any of the
+ pool hierarchy. */
+ apr_pool_pre_cleanup_register(pool, object_ref, object_ref_cleanup);
}
/* Actual implementation of svn_object_pool__lookup.