Author: stsp
Date: Wed Jun 1 14:47:36 2011
New Revision: 1130168
URL: http://svn.apache.org/viewvc?rev=1130168&view=rev
Log:
* subversion/libsvn_client/patch.c
(apply_one_patch): Put temporary hash table indices into the scratch_pool
instead of the result_pool.
Modified:
subversion/trunk/subversion/libsvn_client/patch.c
Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=1130168&r1=1130167&r2=1130168&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Wed Jun 1 14:47:36 2011
@@ -1732,8 +1732,8 @@ apply_one_patch(patch_target_t **patch_t
}
}
- /* Match property hunks. ### Can we use scratch_pool here? */
- for (hash_index = apr_hash_first(result_pool, patch->prop_patches);
+ /* Match property hunks. */
+ for (hash_index = apr_hash_first(scratch_pool, patch->prop_patches);
hash_index;
hash_index = apr_hash_next(hash_index))
{
@@ -1783,7 +1783,7 @@ apply_one_patch(patch_target_t **patch_t
}
/* Apply or reject property hunks. */
- for (hash_index = apr_hash_first(result_pool, target->prop_targets);
+ for (hash_index = apr_hash_first(scratch_pool, target->prop_targets);
hash_index;
hash_index = apr_hash_next(hash_index))
{
