svn commit: r1482135 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_wc/conflicts.c

[breser]

Author: breser
Date: Mon May 13 22:34:54 2013
New Revision: 1482135

URL: http://svn.apache.org/r1482135
Log:
Merge the r1481800 group from trunk:

 * r1481800, r1481813
   Use result_pool for items copied to output array.
   Justification:
     Allocate output in correct pool to avoid possible memory use after clear.
   Votes:
     +1: philip, brane, stsp
     +1: rhuijben (r1481800 only)


Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_wc/conflicts.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1481800,1481813

Modified: subversion/branches/1.8.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1482135&r1=1482134&r2=1482135&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon May 13 22:34:54 2013
@@ -125,14 +125,6 @@ Approved changes:
 # blocking issues.  If in doubt see this link for details:
 # 
http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
 
- * r1481800, r1481813
-   Use result_pool for items copied to output array.
-   Justification:
-     Allocate output in correct pool to avoid possible memory use after clear.
-   Votes:
-     +1: philip, brane, stsp
-     +1: rhuijben (r1481800 only)
-
  * r1481625, r1481627, r1481628, r1481631, r1481632
    Properly escape control characters in an error message in libsvn_fs_fs.
    Remove duplicated code.

Modified: subversion/branches/1.8.x/subversion/libsvn_wc/conflicts.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_wc/conflicts.c?rev=1482135&r1=1482134&r2=1482135&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_wc/conflicts.c Mon May 13 
22:34:54 2013
@@ -159,16 +159,16 @@ conflict__read_location(svn_wc_conflict_
     }
   c = c->next;
 
-  repos_root_url = apr_pstrmemdup(scratch_pool, c->data, c->len);
+  repos_root_url = apr_pstrmemdup(result_pool, c->data, c->len);
   c = c->next;
 
   if (c->is_atom)
-    repos_uuid = apr_pstrmemdup(scratch_pool, c->data, c->len);
+    repos_uuid = apr_pstrmemdup(result_pool, c->data, c->len);
   else
     repos_uuid = NULL;
   c = c->next;
 
-  repos_relpath = apr_pstrmemdup(scratch_pool, c->data, c->len);
+  repos_relpath = apr_pstrmemdup(result_pool, c->data, c->len);
   c = c->next;
 
   SVN_ERR(svn_skel__parse_int(&v, c, scratch_pool));
@@ -2235,7 +2235,7 @@ svn_wc__read_conflicts(const apr_array_h
   SVN_ERR(svn_wc__conflict_read_info(&operation, &locations, &text_conflicted,
                                      &prop_conflicted, &tree_conflicted,
                                      db, local_abspath, conflict_skel,
-                                     scratch_pool, scratch_pool));
+                                     result_pool, scratch_pool));
 
   cflcts = apr_array_make(result_pool, 4,
                           sizeof(svn_wc_conflict_description2_t*));