From commits-return-48852-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Mon May 7 19:04:25 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id BB518180648 for ; Mon, 7 May 2018 19:04:24 +0200 (CEST) Received: (qmail 60836 invoked by uid 500); 7 May 2018 17:04:23 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 60826 invoked by uid 99); 7 May 2018 17:04:23 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 May 2018 17:04:23 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E31BA3A00E7 for ; Mon, 7 May 2018 17:04:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1831110 - /subversion/trunk/subversion/libsvn_repos/authz_parse.c Date: Mon, 07 May 2018 17:04:22 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180507170422.E31BA3A00E7@svn01-us-west.apache.org> 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;