svn commit: r1731160 - /subversion/trunk/subversion/libsvn_repos/log.c

[st...@apache.org]

Author: stefan2
Date: Thu Feb 18 22:11:36 2016
New Revision: 1731160

URL: http://svn.apache.org/viewvc?rev=1731160&view=rev
Log:
Change some confusing pool usage.

Found by: rhuijben

* subversion/libsvn_repos/log.c
  (fs_mergeinfo_changed): Tighten the memory pool usage. The SCRATCH_POOL
                          would actually live longer than we need it to.

Modified:
    subversion/trunk/subversion/libsvn_repos/log.c

Modified: subversion/trunk/subversion/libsvn_repos/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/log.c?rev=1731160&r1=1731159&r2=1731160&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/log.c (original)
+++ subversion/trunk/subversion/libsvn_repos/log.c Thu Feb 18 22:11:36 2016
@@ -656,7 +656,7 @@ fs_mergeinfo_changed(svn_mergeinfo_catal
      narrow down our search. */
   SVN_ERR(svn_fs_revision_root(&root, fs, rev, scratch_pool));
   SVN_ERR(svn_fs_paths_changed3(&iterator, root, iterator_pool,
-                                scratch_pool));
+                                iterator_pool));
   SVN_ERR(svn_fs_path_change_get(&change, iterator));
 
   /* Look for copies and (potential) mergeinfo changes.
@@ -692,7 +692,7 @@ fs_mergeinfo_changed(svn_mergeinfo_catal
   /* There is or may be some m/i change. Look closely now. */
   svn_pool_clear(iterator_pool);
   SVN_ERR(svn_fs_paths_changed3(&iterator, root, iterator_pool,
-                                scratch_pool));
+                                iterator_pool));
 
   /* Loop over changes, looking for anything that might carry an
      svn:mergeinfo change and is one of our paths of interest, or a