subversion-1.9.7HEADsubversion-1.9.7master

1 files changed, 4 insertions, 2 deletions

diff --git a/subversion/libsvn_client/iprops.c b/subversion/libsvn_client/iprops.c
index 653ce8c..9d725bf 100644
--- a/subversion/libsvn_client/iprops.c
+++ b/subversion/libsvn_client/iprops.c
@@ -176,8 +176,8 @@ get_inheritable_props(apr_hash_t **wcroot_iprops,
            hi;
            hi = apr_hash_next(hi))
         {
-          const char *child_abspath = svn__apr_hash_index_key(hi);
-          const char *child_repos_relpath = svn__apr_hash_index_val(hi);
+          const char *child_abspath = apr_hash_this_key(hi);
+          const char *child_repos_relpath = apr_hash_this_val(hi);
           const char *url;
           apr_array_header_t *inherited_props;
           svn_error_t *err;
@@ -244,6 +244,8 @@ svn_client__get_inheritable_props(apr_hash_t **wcroot_iprops,
   const char *old_session_url;
   svn_error_t *err;
 
+  *wcroot_iprops = NULL;
+
   if (!SVN_IS_VALID_REVNUM(revision))
     return SVN_NO_ERROR;