svn commit: r1058276 - /subversion/branches/1.6.x-r1058269/subversion/libsvn_client/merge.c

[st...@apache.org]

Author: stsp
Date: Wed Jan 12 18:59:04 2011
New Revision: 1058276

URL: http://svn.apache.org/viewvc?rev=1058276&view=rev
Log:
On the 1.6.x-r1058269 branch:

* subversion/libsvn_client/merge.c
  (tree_conflict): Fix crash due to uninitialised pointer dereference bug
   introduced during sloppy conflict resolution (ooops!).
   Adjust a comment and remove an empty line, both to match trunk's code. 

Modified:
    subversion/branches/1.6.x-r1058269/subversion/libsvn_client/merge.c

Modified: subversion/branches/1.6.x-r1058269/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-r1058269/subversion/libsvn_client/merge.c?rev=1058276&r1=1058275&r2=1058276&view=diff
==============================================================================
--- subversion/branches/1.6.x-r1058269/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.6.x-r1058269/subversion/libsvn_client/merge.c Wed Jan 12 18:59:04 2011
@@ -531,14 +531,13 @@ tree_conflict(merge_cmd_baton_t *merge_b
   if (merge_b->record_only || merge_b->dry_run)
     return SVN_NO_ERROR;
 
-  SVN_ERR(svn_wc__get_tree_conflict(&existing_conflict, conflict->path,
+  SVN_ERR(svn_wc__get_tree_conflict(&existing_conflict, victim_path,
                                     adm_access, merge_b->pool));
   if (existing_conflict == NULL)
     {
-      /* Construct the new conflict first to get the proper conflict->path */
+      /* There is no existing tree conflict so it is safe to add one. */
       SVN_ERR(make_tree_conflict(&conflict, merge_b, adm_access, victim_path,
                                  node_kind, action, reason));
-
       SVN_ERR(svn_wc__add_tree_conflict(conflict, adm_access, merge_b->pool));
     }