svn commit: r1436564 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

[pburba]

Author: pburba
Date: Mon Jan 21 19:18:59 2013
New Revision: 1436564

URL: http://svn.apache.org/viewvc?rev=1436564&view=rev
Log:
Fix issue #4298 "'svn sw' with add on unversioned segfaults".

* subversion/libsvn_wc/conflicts.c
  (svn_wc__read_conflicts): Follow-up to r1432454, use the correct pool
   when allocating svn_wc_conflict_description2_t.

Modified:
    subversion/trunk/subversion/libsvn_wc/conflicts.c

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1436564&r1=1436563&r2=1436564&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Mon Jan 21 19:18:59 2013
@@ -2216,7 +2216,7 @@ svn_wc__read_conflicts(const apr_array_h
                                        db, local_abspath,
                                        operation, left_version, right_version,
                                        local_change, incoming_change,
-                                       scratch_pool, scratch_pool));
+                                       result_pool, scratch_pool));
 
       APR_ARRAY_PUSH(cflcts, const svn_wc_conflict_description2_t *) = desc;
     }