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 2013/10/10 06:02:01 UTC
svn commit: r1530851 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_fs/fs-loader.c
Author: svn-role
Date: Thu Oct 10 04:02:00 2013
New Revision: 1530851
URL: http://svn.apache.org/r1530851
Log:
Merge the r1519615 group from trunk:
* r1519615, r1519617, r1519733
Fix a memory problem in the 3rd party FS module loader.
Changes[dev]:
* fs loader: fix segfault with 3rd party modules and common_pool (rNNNNNNN)
Justification:
Not enabled in default build but a SEGV likely when triggered.
Votes:
+1: philip, danielsh, stefan2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_fs/fs-loader.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1519615,1519617,1519733
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1530851&r1=1530850&r2=1530851&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Oct 10 04:02:00 2013
@@ -147,15 +147,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1519615, r1519617, r1519733
- Fix a memory problem in the 3rd party FS module loader.
- Changes[dev]:
- * fs loader: fix segfault with 3rd party modules and common_pool (rNNNNNNN)
- Justification:
- Not enabled in default build but a SEGV likely when triggered.
- Votes:
- +1: philip, danielsh, stefan2
-
* r1519955
Fix a segfault with 'svn mergeinfo'.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_fs/fs-loader.c?rev=1530851&r1=1530850&r2=1530851&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_fs/fs-loader.c Thu Oct 10 04:02:00 2013
@@ -81,7 +81,8 @@ static struct fs_type_defn base_defn =
#else
NULL,
#endif
- NULL
+ NULL /* End of static list: this needs to be reset to NULL if the
+ common_pool used when setting it has been cleared. */
};
static struct fs_type_defn fsfs_defn =
@@ -355,6 +356,7 @@ svn_fs_initialize(apr_pool_t *pool)
return SVN_NO_ERROR;
common_pool = svn_pool_create(pool);
+ base_defn.next = NULL;
SVN_ERR(svn_mutex__init(&common_pool_lock, TRUE, common_pool));
/* ### This won't work if POOL is NULL and libsvn_fs is loaded as a DSO