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

[stsp]

Author: stsp
Date: Fri Sep 16 14:45:30 2016
New Revision: 1761042

URL: http://svn.apache.org/viewvc?rev=1761042&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (find_deleted_rev): Set yca_loc to NULL in the error path that needs this.

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=1761042&r1=1761041&r2=1761042&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Sep 16 14:45:30 
2016
@@ -678,7 +678,7 @@ find_deleted_rev(void *baton,
           if (b->related_repos_relpath != NULL &&
               b->related_repos_peg_rev != SVN_INVALID_REVNUM)
             {
-              svn_client__pathrev_t *yca_loc = NULL;
+              svn_client__pathrev_t *yca_loc;
               svn_error_t *err;
 
               /* We found a deleted node which occupies the correct path.
@@ -696,10 +696,14 @@ find_deleted_rev(void *baton,
                 {
                   /* ### Happens for moves within other moves and copies. */
                   if (err->apr_err == SVN_ERR_FS_NOT_FOUND)
-                    svn_error_clear(err);
+                    {
+                      svn_error_clear(err);
+                      yca_loc = NULL;
+                    }
                   else
                     return svn_error_trace(err);
                 }
+
               deleted_node_found = (yca_loc != NULL);
             }