svn commit: r1648242 - /subversion/trunk/subversion/libsvn_fs_fs/tree.c

[st...@apache.org]

Author: stefan2
Date: Sun Dec 28 18:50:46 2014
New Revision: 1648242

URL: http://svn.apache.org/r1648242
Log:
* subversion/libsvn_fs_fs/tree.c
  (fs_copied_from): Copy the result requested, so we don't need the
                    node to remain valid.  Don't lock the DAG cache.

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/tree.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/tree.c?rev=1648242&r1=1648241&r2=1648242&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/tree.c Sun Dec 28 18:50:46 2014
@@ -2870,13 +2870,15 @@ fs_copied_from(svn_revnum_t *rev_p,
                apr_pool_t *pool)
 {
   dag_node_t *node;
+  const char *cpath;
 
   /* There is no cached entry, look it up the old-fashioned
       way. */
-  SVN_ERR(get_dag(&node, root, path, TRUE, pool));
+  SVN_ERR(get_dag(&node, root, path, FALSE, pool));
   SVN_ERR(svn_fs_fs__dag_get_copyfrom_rev(rev_p, node));
-  SVN_ERR(svn_fs_fs__dag_get_copyfrom_path(path_p, node));
+  SVN_ERR(svn_fs_fs__dag_get_copyfrom_path(&cpath, node));
 
+  *path_p = apr_pstrdup(pool, cpath);
   return SVN_NO_ERROR;
 }