subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1541278 - /subversion/trunk/subversion/libsvn_repos/authz_pool.c
Date Tue, 12 Nov 2013 22:30:33 GMT
Author: stefan2
Date: Tue Nov 12 22:30:32 2013
New Revision: 1541278

URL: http://svn.apache.org/r1541278
Log:
Fix various bugs in the authz pool.

* subversion/libsvn_repos/authz_pool.c
  (svn_repos__authz_pool_get): use the correct paths and pools;
                               destroy unused temporary pool

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

Modified: subversion/trunk/subversion/libsvn_repos/authz_pool.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/authz_pool.c?rev=1541278&r1=1541277&r2=1541278&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/authz_pool.c (original)
+++ subversion/trunk/subversion/libsvn_repos/authz_pool.c Tue Nov 12 22:30:32 2013
@@ -166,7 +166,7 @@ svn_repos__authz_pool_get(svn_authz_t **
     SVN_ERR(svn_repos__config_pool_get(&authz_ref->groups_cfg,
                                        &authz_ref->groups_key,
                                        authz_pool->config_pool,
-                                       path, must_exist, TRUE,
+                                       groups_path, must_exist, TRUE,
                                        preferred_repos, authz_ref_pool));
 
   authz_ref->key = construct_key(authz_ref->authz_key,
@@ -176,9 +176,12 @@ svn_repos__authz_pool_get(svn_authz_t **
   SVN_ERR(svn_object_pool__lookup((void **)authz_p, authz_pool->object_pool,
                                   authz_ref->key, NULL, pool));
   if (*authz_p)
-    return SVN_NO_ERROR;
+    {
+      svn_pool_destroy(authz_ref_pool);
+      return SVN_NO_ERROR;
+    }
 
-  authz_ref->authz = apr_palloc(pool, sizeof(*authz_ref->authz));
+  authz_ref->authz = apr_palloc(authz_ref_pool, sizeof(*authz_ref->authz));
   authz_ref->authz->cfg = authz_ref->authz_cfg;
 
   if (groups_path)



Mime
View raw message