svn commit: r1305643 - /subversion/branches/inheritable-props/subversion/libsvn_client/prop_commands.c

[pb...@apache.org]

Author: pburba
Date: Mon Mar 26 22:30:24 2012
New Revision: 1305643

URL: http://svn.apache.org/viewvc?rev=1305643&view=rev
Log:
On the inheritable-props branch: Fix a bug in the new FS API.

* subversion/libsvn_client/prop_commands.c
  (fs_node_proplist): Don't assume callers always want explicit properties,
   they may be looking for inherited only.

Modified:
    subversion/branches/inheritable-props/subversion/libsvn_client/prop_commands.c

Modified: subversion/branches/inheritable-props/subversion/libsvn_client/prop_commands.c
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/subversion/libsvn_client/prop_commands.c?rev=1305643&r1=1305642&r2=1305643&view=diff
==============================================================================
--- subversion/branches/inheritable-props/subversion/libsvn_client/prop_commands.c (original)
+++ subversion/branches/inheritable-props/subversion/libsvn_client/prop_commands.c Mon Mar 26 22:30:24 2012
@@ -1026,6 +1026,15 @@ remote_proplist(const char *target_prefi
                                target_full_url);
     }
 
+  /* svn_ra_get_file2 and svn_ra_get_dir3 shouldn't be asking a server for
+     inherited props if the server doesn't advertise the
+     SVN_RA_CAPABILITY_INHERITED_PROPS capability, but better to check and
+     error out than segfault. */
+  if (get_target_inherited_props && inherited_props == NULL)
+    return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
+                             _("Server does not support retrieving "
+                               "inherited properties"));
+
   /* Filter out non-regular properties, since the RA layer returns all
      kinds.  Copy regular properties keys/vals from the prop_hash
      allocated in SCRATCH_POOL to the "final" hash allocated in POOL. */