You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2010/04/19 22:07:21 UTC

svn commit: r935722 - in /subversion/trunk/subversion: libsvn_subr/dirent_uri.c libsvn_subr/iter.c libsvn_wc/entries.c

Author: gstein
Date: Mon Apr 19 20:07:21 2010
New Revision: 935722

URL: http://svn.apache.org/viewvc?rev=935722&view=rev
Log:
Fix some pool bugs.

* subversion/libsvn_subr/dirent_uri.c:
  (svn_dirent_condense_targets): for the single-target case, make sure to
    put *PCOMMON into the RESULT_POOL

* subversion/libsvn_subr/iter.c:
  (svn_iter_apr_array): fix Day One bug: each iteration should use the
    iteration pool that was the whole reason for this stuff

* subversion/libsvn_wc/entries.c:
  (get_base_info_for_deleted): yes, it should use RESULT_POOL

Modified:
    subversion/trunk/subversion/libsvn_subr/dirent_uri.c
    subversion/trunk/subversion/libsvn_subr/iter.c
    subversion/trunk/subversion/libsvn_wc/entries.c

Modified: subversion/trunk/subversion/libsvn_subr/dirent_uri.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/dirent_uri.c?rev=935722&r1=935721&r2=935722&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/dirent_uri.c (original)
+++ subversion/trunk/subversion/libsvn_subr/dirent_uri.c Mon Apr 19 20:07:21 2010
@@ -1817,6 +1817,7 @@ svn_dirent_condense_targets(const char *
   /* Early exit when there's only one dirent to work on. */
   if (targets->nelts == 1)
     {
+      *pcommon = apr_pstrdup(result_pool, *pcommon);
       if (pcondensed_targets)
         *pcondensed_targets = apr_array_make(result_pool, 0,
                                              sizeof(const char *));

Modified: subversion/trunk/subversion/libsvn_subr/iter.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/iter.c?rev=935722&r1=935721&r2=935722&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/iter.c (original)
+++ subversion/trunk/subversion/libsvn_subr/iter.c Mon Apr 19 20:07:21 2010
@@ -153,7 +153,7 @@ svn_iter_apr_array(svn_boolean_t *comple
 
       svn_pool_clear(iterpool);
 
-      err = (*func)(baton, item, pool);
+      err = (*func)(baton, item, iterpool);
     }
 
   if (completed)

Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=935722&r1=935721&r2=935722&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Mon Apr 19 20:07:21 2010
@@ -323,8 +323,7 @@ get_base_info_for_deleted(svn_wc_entry_t
         svn_dirent_is_child(parent_abspath,
                             entry_abspath,
                             NULL),
-        /* ### should be result_pool? */
-        scratch_pool);
+        result_pool);
     }
   else
     {