svn commit: r1499360 - /subversion/trunk/subversion/libsvn_wc/deprecated.c

[stsp]

Author: stsp
Date: Wed Jul  3 12:25:06 2013
New Revision: 1499360

URL: http://svn.apache.org/r1499360
Log:
* subversion/libsvn_wc/deprecated.c
  (svn_wc__status2_from_3): Fix a wrong pointer passed to svn_wc__cd3_to_cd2().
   Should fix segfaults in ruby-bindings tests on the bb-openbsd bot.

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

Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=1499360&r1=1499359&r2=1499360&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Wed Jul  3 12:25:06 2013
@@ -2682,7 +2682,7 @@ svn_wc__status2_from_3(svn_wc_status2_t 
       const svn_wc_conflict_description2_t *tree_conflict2;
       SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, wc_ctx, local_abspath,
                                         scratch_pool, scratch_pool));
-      tree_conflict2 = svn_wc__cd3_to_cd2(tree_conflict2, scratch_pool);
+      tree_conflict2 = svn_wc__cd3_to_cd2(tree_conflict, scratch_pool);
       (*status)->tree_conflict = svn_wc__cd2_to_cd(tree_conflict2, 
result_pool);
     }