svn commit: r1214721 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

[st...@apache.org]

Author: stsp
Date: Thu Dec 15 12:14:06 2011
New Revision: 1214721

URL: http://svn.apache.org/viewvc?rev=1214721&view=rev
Log:
* subversion/libsvn_fs_fs/fs_fs.c
  (hotcopy_copy_packed_shard, hotcopy_remove_rev_files): Don't use an
   uninitialised pool.
 
Found by: philip

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1214721&r1=1214720&r2=1214721&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Thu Dec 15 12:14:06 2011
@@ -7871,7 +7871,7 @@ hotcopy_copy_packed_shard(svn_revnum_t *
   src_subdir = svn_dirent_join(src_fs->path, PATH_REVS_DIR, scratch_pool);
   dst_subdir = svn_dirent_join(dst_fs->path, PATH_REVS_DIR, scratch_pool);
   shard_rev = rev / max_files_per_dir;
-  packed_shard = apr_psprintf(iterpool, "%ld.pack", shard_rev);
+  packed_shard = apr_psprintf(scratch_pool, "%ld.pack", shard_rev);
   src_subdir_packed_shard = svn_dirent_join(src_subdir, packed_shard,
                                             scratch_pool);
   SVN_ERR(hotcopy_io_copy_dir_recursively(src_subdir_packed_shard,
@@ -7974,7 +7974,7 @@ hotcopy_remove_rev_files(svn_fs_t *dst_f
   dst_subdir = svn_dirent_join(dst_fs->path, PATH_REVS_DIR, scratch_pool);
 
   /* Pre-compute paths for initial shard. */
-  shard = apr_psprintf(iterpool, "%ld", start_rev / max_files_per_dir);
+  shard = apr_psprintf(scratch_pool, "%ld", start_rev / max_files_per_dir);
   dst_subdir_shard = svn_dirent_join(dst_subdir, shard, scratch_pool);
 
   iterpool = svn_pool_create(scratch_pool);