You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/04/14 15:34:54 UTC

svn commit: r1092232 - /subversion/trunk/subversion/libsvn_wc/node.c

Author: rhuijben
Date: Thu Apr 14 13:34:53 2011
New Revision: 1092232

URL: http://svn.apache.org/viewvc?rev=1092232&view=rev
Log:
* subversion/libsvn_wc/node.c
  (svn_wc__node_get_origin): Pass required arguments to
    svn_wc__db_info_below_working() to avoid segfault.

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

Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1092232&r1=1092231&r2=1092232&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Thu Apr 14 13:34:53 2011
@@ -1599,10 +1599,14 @@ svn_wc__node_get_origin(svn_boolean_t *i
     if (status == svn_wc__db_status_added)
       scan_working = TRUE;
     else if (status == svn_wc__db_status_deleted)
-      /* Is this a BASE or a WORKING delete? */
-      SVN_ERR(svn_wc__db_info_below_working(NULL, &scan_working, NULL,
-                                            wc_ctx->db, local_abspath,
-                                            scratch_pool));
+      {
+        svn_boolean_t have_base;
+        svn_wc__db_status_t status;
+        /* Is this a BASE or a WORKING delete? */
+        SVN_ERR(svn_wc__db_info_below_working(&have_base, &scan_working, &status,
+                                              wc_ctx->db, local_abspath,
+                                              scratch_pool));
+      }
 
     if (scan_working)
       {