You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Rall <dl...@collab.net> on 2006/12/19 22:00:00 UTC
Re: svn commit: r22729 - in trunk/subversion: libsvn_fs_base libsvn_fs_fs
Ben, I've nominated this for backport to the 1.4.x line.
On Fri, 15 Dec 2006, sussman@tigris.org wrote:
> Author: sussman
> Date: Fri Dec 15 15:43:59 2006
> New Revision: 22729
>
> Log:
> Fix potential filesystem memleak in commit-finalization loop.
>
> * subversion/libsvn_fs_base/tree.c (merge),
> * subversion/libsvn_fs_fs/tree.c (merge): use iterpool in the entries loop.
>
>
> Modified:
> trunk/subversion/libsvn_fs_base/tree.c
> trunk/subversion/libsvn_fs_fs/tree.c
>
> Modified: trunk/subversion/libsvn_fs_base/tree.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_base/tree.c?pathrev=22729&r1=22728&r2=22729
> ==============================================================================
> --- trunk/subversion/libsvn_fs_base/tree.c (original)
> +++ trunk/subversion/libsvn_fs_base/tree.c Fri Dec 15 15:43:59 2006
> @@ -2032,12 +2032,12 @@
> if (s_entry)
> {
> SVN_ERR(svn_fs_base__dag_set_entry(target, key, s_entry->id,
> - txn_id, trail, pool));
> + txn_id, trail, iterpool));
> }
> else
> {
> SVN_ERR(svn_fs_base__dag_delete(target, key, txn_id,
> - trail, pool));
> + trail, iterpool));
> }
> }
>
>
> Modified: trunk/subversion/libsvn_fs_fs/tree.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_fs/tree.c?pathrev=22729&r1=22728&r2=22729
> ==============================================================================
> --- trunk/subversion/libsvn_fs_fs/tree.c (original)
> +++ trunk/subversion/libsvn_fs_fs/tree.c Fri Dec 15 15:43:59 2006
> @@ -1431,11 +1431,11 @@
> s_entry->id,
> s_entry->kind,
> txn_id,
> - pool));
> + iterpool));
> }
> else
> {
> - SVN_ERR(svn_fs_fs__dag_delete(target, key, txn_id, pool));
> + SVN_ERR(svn_fs_fs__dag_delete(target, key, txn_id, iterpool));
> }
> }
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org