diff options
| author | peter <peter@FreeBSD.org> | 2013-11-11 01:00:29 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2013-11-11 01:00:29 +0000 |
| commit | 68301b10e52aedbf076b5b08303439d75c192e18 (patch) | |
| tree | c05673887167c7ecd55a62ed72830f5186f453c1 /subversion/libsvn_fs/fs-loader.c | |
| parent | 3b9f7e96381479fb03ae2c36d490a38718f71083 (diff) | |
| download | FreeBSD-src-68301b10e52aedbf076b5b08303439d75c192e18.zip FreeBSD-src-68301b10e52aedbf076b5b08303439d75c192e18.tar.gz | |
Import svn-1.8.4, which includes fixes for both security and merge
handling.
Diffstat (limited to 'subversion/libsvn_fs/fs-loader.c')
| -rw-r--r-- | subversion/libsvn_fs/fs-loader.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/subversion/libsvn_fs/fs-loader.c b/subversion/libsvn_fs/fs-loader.c index 01d6ba1..336b84f 100644 --- a/subversion/libsvn_fs/fs-loader.c +++ b/subversion/libsvn_fs/fs-loader.c @@ -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 |
