svn commit: r1747728 - /subversion/trunk/subversion/libsvn_client/conflicts.c

[st...@apache.org]

Author: stsp
Date: Fri Jun 10 15:07:39 2016
New Revision: 1747728

URL: http://svn.apache.org/viewvc?rev=1747728&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (resolve_incoming_move_file_text_merge): Initialize local_abspath earlier,
   before we use it in an error path.

Found by: svn-windows-local buildbot

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

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1747728&r1=1747727&r2=1747728&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Jun 10 15:07:39 2016
@@ -5614,6 +5614,7 @@ resolve_incoming_move_file_text_merge(sv
   apr_array_header_t *propdiffs;
   struct conflict_tree_incoming_delete_details *details;
 
+  local_abspath = svn_client_conflict_get_local_abspath(conflict);
   details = conflict->tree_conflict_incoming_details;
   if (details == NULL)
     return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL,
@@ -5625,7 +5626,6 @@ resolve_incoming_move_file_text_merge(sv
                                                    scratch_pool));
 
   option_id = svn_client_conflict_option_get_id(option);
-  local_abspath = svn_client_conflict_get_local_abspath(conflict);
   SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, &repos_uuid,
                                              conflict, scratch_pool,
                                              scratch_pool));