svn commit: r1831110 - /subversion/trunk/subversion/libsvn_repos/authz_parse.c

[philip]

Author: philip
Date: Mon May  7 17:04:22 2018
New Revision: 1831110

URL: http://svn.apache.org/viewvc?rev=1831110&view=rev
Log:
Fix issue 4741: authz group cannot refer to multiple groups.

* subversion/libsvn_repos/authz_parse.c
  (expand_group_callback): Do not overwrite variable when recursing.

Modified:
    subversion/trunk/subversion/libsvn_repos/authz_parse.c

Modified: subversion/trunk/subversion/libsvn_repos/authz_parse.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/authz_parse.c?rev=1831110&r1=1831109&r2=1831110&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/authz_parse.c (original)
+++ subversion/trunk/subversion/libsvn_repos/authz_parse.c Mon May  7 17:04:22 
2018
@@ -1058,14 +1058,15 @@ expand_group_callback(void *baton,
       else
         {
           /* Recursively expand the group membership */
-          members = svn_hash_gets(cb->parsed_groups, member);
-          if (!members)
+          apr_array_header_t *member_members
+            = svn_hash_gets(cb->parsed_groups, member);
+          if (!member_members)
             return svn_error_createf(
                 SVN_ERR_AUTHZ_INVALID_CONFIG, NULL,
                 _("Undefined group '%s'"),
                 member);
           SVN_ERR(expand_group_callback(cb, key, klen,
-                                        members, scratch_pool));
+                                        member_members, scratch_pool));
         }
     }
   return SVN_NO_ERROR;